| Index: trunk/tools/mwmultiversion/wmf-config/CommonSettings.php |
| — | — | @@ -85,12 +85,13 @@ |
| 86 | 86 | |
| 87 | 87 | $DP = $IP; |
| 88 | 88 | |
| | 89 | +wfProfileOut( "$fname-init" ); |
| | 90 | +wfProfileIn( "$fname-host" ); |
| | 91 | + |
| | 92 | +$secure = getenv( 'MW_SECURE_HOST' ); |
| 89 | 93 | # This must be set *after* the DefaultSettings.php inclusion |
| 90 | 94 | $wgDBname = $multiVersion->getDatabase(); |
| 91 | 95 | |
| 92 | | -wfProfileOut( "$fname-init" ); |
| 93 | | -wfProfileIn( "$fname-host" ); |
| 94 | | - |
| 95 | 96 | # wmf-config directory (in common/) |
| 96 | 97 | $wmfConfigDir = "$IP/../wmf-config"; |
| 97 | 98 | |
| — | — | @@ -183,7 +184,6 @@ |
| 184 | 185 | require( "$wmfConfigDir/db.php" ); |
| 185 | 186 | require( "$wmfConfigDir/mc.php" ); |
| 186 | 187 | |
| 187 | | -$secure = getenv( 'MW_SECURE_HOST' ); |
| 188 | 188 | |
| 189 | 189 | # Protocol settings for urls |
| 190 | 190 | if ( !$secure && $wmgHTTPSExperiment ) { |
| — | — | @@ -278,7 +278,7 @@ |
| 279 | 279 | $wgRCMaxAge = 30*86400; |
| 280 | 280 | |
| 281 | 281 | $wgUseTeX = true; |
| 282 | | -$wgTexvc = "/usr/local/apache/uncommon/$wgVersionNumber/bin"; |
| | 282 | +$wgTexvc = "/usr/local/apache/uncommon/$wgVersionNumber/bin/texvc"; |
| 283 | 283 | $wgTmpDirectory = '/tmp'; |
| 284 | 284 | $wgLegalTitleChars = "+ %!\"$&'()*,\\-.\\/0-9:;=?@A-Z\\\\^_`a-z~\\x80-\\xFF"; |
| 285 | 285 | |
| — | — | @@ -2290,7 +2290,7 @@ |
| 2291 | 2291 | if ( $wmgUseMoodBar ) { |
| 2292 | 2292 | require_once( "$IP/extensions/MoodBar/MoodBar.php" ); |
| 2293 | 2293 | $wgMoodBarCutoffTime = '20110725221004'; |
| 2294 | | - $wgMoodBarConfig['privacyUrl'] = 'http://wikimediafoundation.org/wiki/Feedback_policy'; |
| | 2294 | + $wgMoodBarConfig['privacyUrl'] = 'http://wikimediafoundation.org/wiki/Feedback'; |
| 2295 | 2295 | } |
| 2296 | 2296 | |
| 2297 | 2297 | if ( $wmgUseSubPageList3 ) { |