| Index: trunk/tools/mwmultiversion/wmf-config/CommonSettings.php |
| — | — | @@ -824,6 +824,11 @@ |
| 825 | 825 | $wgUseTidy = false; |
| 826 | 826 | } |
| 827 | 827 | |
| | 828 | +if ( $wgUseContactPageFundraiser ) { |
| | 829 | + include( "$IP/extensions/ContactPageFundraiser/ContactPage.php" ); |
| | 830 | + $wgContactUser = 'Storiescontact'; |
| | 831 | +} |
| | 832 | + |
| 828 | 833 | if ( $wgDBname == 'foundationwiki' ) { |
| 829 | 834 | include( "$IP/extensions/FormPreloadPostCache/FormPreloadPostCache.php" ); |
| 830 | 835 | include( "$IP/extensions/SkinPerPage/SkinPerPage.php" ); |
| — | — | @@ -834,8 +839,6 @@ |
| 835 | 840 | include( "$IP/extensions/ContributionReporting/ContributionReporting.php" ); |
| 836 | 841 | include( "$wmfConfigDir/reporting-setup.php" ); |
| 837 | 842 | |
| 838 | | - include( "$IP/extensions/ContactPageFundraiser/ContactPage.php" ); |
| 839 | | - $wgContactUser = 'Storiescontact'; |
| 840 | 843 | $wgUseTidy = false; |
| 841 | 844 | |
| 842 | 845 | $wgAllowedTemplates = array( |
| — | — | @@ -1185,8 +1188,8 @@ |
| 1186 | 1189 | |
| 1187 | 1190 | // Newer entries |
| 1188 | 1191 | if( $wgDBname == 'zhwiki' ) $wgCacheEpoch = '20060528093500'; # parser bug? |
| 1189 | | -if( $wgDBname == 'lawikibooks' ) $wgCacheEpoch = '20060610090000'; # sidebar bug |
| 1190 | | -if ( $wmgHTTPSExperiment ) $wgCacheEpoch = '20110714183000'; |
| | 1192 | +if( $wgDBname == 'lawikibooks' ) $wgCacheEpoch = '20060610090000'; # sidebar bug |
| | 1193 | +if ( $wmgHTTPSExperiment ) $wgCacheEpoch = '20110718202400'; |
| 1191 | 1194 | |
| 1192 | 1195 | #$wgThumbnailEpoch = '20060227114700'; # various rsvg and imagemagick fixes |
| 1193 | 1196 | $wgThumbnailEpoch = '20051227114700'; # various rsvg and imagemagick fixes |
| — | — | @@ -1773,7 +1776,7 @@ |
| 1774 | 1777 | } |
| 1775 | 1778 | |
| 1776 | 1779 | function wfNoDeleteMainPage( &$title, &$user, $action, &$result ) { |
| 1777 | | - global $wgMessageCache, $wgDBname; |
| | 1780 | + global $wgMessageCache; |
| 1778 | 1781 | if ( $action !== 'delete' && $action !== 'move' ) { |
| 1779 | 1782 | return true; |
| 1780 | 1783 | } |
| — | — | @@ -1827,6 +1830,10 @@ |
| 1828 | 1831 | |
| 1829 | 1832 | $wgCollectionPortletForLoggedInUsersOnly = $wmgCollectionPortletForLoggedInUsersOnly; |
| 1830 | 1833 | $wgCollectionArticleNamespaces = $wmgCollectionArticleNamespaces; |
| | 1834 | + |
| | 1835 | + if ( $wmgCollectionHierarchyDelimiter ) { |
| | 1836 | + $wgCollectionHierarchyDelimiter = $wmgCollectionHierarchyDelimiter; |
| | 1837 | + } |
| 1831 | 1838 | } |
| 1832 | 1839 | |
| 1833 | 1840 | // Testing internally |
| — | — | @@ -2085,11 +2092,12 @@ |
| 2086 | 2093 | $wgArticleFeedbackCategories = $wmgArticleFeedbackCategories; |
| 2087 | 2094 | $wgArticleFeedbackLotteryOdds = $wmgArticleFeedbackLotteryOdds; |
| 2088 | 2095 | $wgArticleFeedbackTrackingVersion = 1; |
| | 2096 | + $wgArticleFeedbackBlacklistCategories = array( 'Article Feedback Blacklist' ); |
| 2089 | 2097 | |
| 2090 | 2098 | $wgArticleFeedbackTracking = array( |
| 2091 | 2099 | 'buckets' => array( |
| 2092 | | - 'track' => 1.35, |
| 2093 | | - 'ignore' => 98.65, |
| | 2100 | + 'track' => 0.386, |
| | 2101 | + 'ignore' => 99.614, |
| 2094 | 2102 | //'track'=>0, 'ignore' => 100 |
| 2095 | 2103 | ), |
| 2096 | 2104 | 'version' => 8, |