| Index: trunk/tools/mwmultiversion/wmf-config/CommonSettings.php |
| — | — | @@ -208,7 +208,7 @@ |
| 209 | 209 | $wgStockPath = '/images'; |
| 210 | 210 | $wgScript = $wgScriptPath.'/index.php'; |
| 211 | 211 | $wgRedirectScript = $wgScriptPath.'/redirect.php'; |
| 212 | | -if ( $wgDBname != 'testwiki' ) { |
| | 212 | +if ( $wgDBname != 'testwiki' && isset( $_SERVER['SERVER_NAME'] ) ) { |
| 213 | 213 | // Make testing JS/skin changes easy by not running load.php through bits for testwiki |
| 214 | 214 | $wgLoadScript = "$urlprotocol//bits.wikimedia.org/{$_SERVER['SERVER_NAME']}/load.php"; |
| 215 | 215 | } |
| — | — | @@ -1206,7 +1206,7 @@ |
| 1207 | 1207 | |
| 1208 | 1208 | # XFF log for vandal tracking |
| 1209 | 1209 | function wfLogXFF() { |
| 1210 | | - if ( $_SERVER['REQUEST_METHOD'] == 'POST' ) { |
| | 1210 | + if ( (@$_SERVER['REQUEST_METHOD']) == 'POST' ) { |
| 1211 | 1211 | $uri = ( $_SERVER['HTTPS'] ? 'https://' : 'http://' ) . |
| 1212 | 1212 | $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; |
| 1213 | 1213 | wfErrorLog( |
| — | — | @@ -2041,6 +2041,7 @@ |
| 2042 | 2042 | require "$IP/extensions/FundraiserPortal/FundraiserPortal.php"; |
| 2043 | 2043 | $wgExtensionFunctions[] = 'setupFundraiserPortal'; |
| 2044 | 2044 | function setupFundraiserPortal() { |
| | 2045 | + global $urlprotocol; |
| 2045 | 2046 | global $wgScriptPath; // SSL may change this after CommonSettings |
| 2046 | 2047 | global $wgFundraiserPortalDirectory, $wgFundraiserPortalPath, $wgFundraiserImageUrl; |
| 2047 | 2048 | $wgFundraiserPortalDirectory = "/mnt/upload6/portal"; |
| — | — | @@ -2096,8 +2097,8 @@ |
| 2097 | 2098 | |
| 2098 | 2099 | $wgArticleFeedbackTracking = array( |
| 2099 | 2100 | 'buckets' => array( |
| 2100 | | - 'track' => 0.318, |
| 2101 | | - 'ignore' => 99.682, |
| | 2101 | + 'track' => 0.27, |
| | 2102 | + 'ignore' => 99.73, |
| 2102 | 2103 | //'track'=>0, 'ignore' => 100 |
| 2103 | 2104 | ), |
| 2104 | 2105 | 'version' => 8, |