| Index: branches/wmf/1.19wmf1/extensions/FlaggedRevs/FlaggedRevs.php |
| — | — | @@ -42,6 +42,7 @@ |
| 43 | 43 | |
| 44 | 44 | # Define were PHP files and i18n files are located |
| 45 | 45 | require( dirname( __FILE__ ) . '/FlaggedRevs.setup.php' ); |
| | 46 | +require( dirname( __FILE__ ) . '/frontend/FlaggedRevsUI.setup.php' ); |
| 46 | 47 | FlaggedRevsSetup::defineSourcePaths( $wgAutoloadClasses, $wgExtensionMessagesFiles ); |
| 47 | 48 | |
| 48 | 49 | # Define JS/CSS modules and file locations |
| Index: branches/wmf/1.19wmf1/extensions/FlaggedRevs/frontend/FlaggedRevsUI.setup.php |
| — | — | @@ -182,7 +182,7 @@ |
| 183 | 183 | * @param $ajaxExportList Array $wgAjaxExportList |
| 184 | 184 | * @return void |
| 185 | 185 | */ |
| 186 | | - public static function defineAjaxFunctions( array &$ajaxExportList ) { |
| | 186 | + public static function defineAjaxFunctions( &$ajaxExportList ) { |
| 187 | 187 | $ajaxExportList[] = 'RevisionReview::AjaxReview'; |
| 188 | 188 | $ajaxExportList[] = 'FlaggablePageView::AjaxBuildDiffHeaderItems'; |
| 189 | 189 | } |
| — | — | @@ -195,7 +195,7 @@ |
| 196 | 196 | * @return void |
| 197 | 197 | */ |
| 198 | 198 | public static function defineLogBasicDescription( |
| 199 | | - array &$logNames, array &$logHeaders, array &$filterLogTypes |
| | 199 | + &$logNames, &$logHeaders, &$filterLogTypes |
| 200 | 200 | ) { |
| 201 | 201 | $logNames['review'] = 'review-logpage'; |
| 202 | 202 | $logHeaders['review'] = 'review-logpagetext'; |
| — | — | @@ -213,7 +213,7 @@ |
| 214 | 214 | * @return void |
| 215 | 215 | */ |
| 216 | 216 | public static function defineLogActionHandlers( |
| 217 | | - array &$logActions, array &$logActionsHandlers |
| | 217 | + &$logActions, &$logActionsHandlers |
| 218 | 218 | ) { |
| 219 | 219 | # Various actions are used for log filtering ... |
| 220 | 220 | $logActions['review/approve'] = 'review-logentry-app'; // checked (again) |
| Index: branches/wmf/1.19wmf1/extensions/CustomUserSignup/CustomUserSignup.php |
| — | — | @@ -45,5 +45,7 @@ |
| 46 | 46 | $wgCustomUserSignupVersion = 1; |
| 47 | 47 | $wgCustomUserSignupSetBuckets = true; |
| 48 | 48 | // For Account Creation Project |
| 49 | | -ClickTrackingHooks::addCampaign($dir. 'modules', 'CustomUserSignup/modules', 'AccountCreationUserBucket' ); |
| | 49 | +if ( class_exists( 'ClickTrackingHooks' ) ) { |
| | 50 | + ClickTrackingHooks::addCampaign($dir. 'modules', 'CustomUserSignup/modules', 'AccountCreationUserBucket' ); |
| | 51 | +} |
| 50 | 52 | |
| Index: branches/wmf/1.19wmf1/extensions/ZeroRatedMobileAccess/ZeroRatedMobileAccess.php |
| — | — | @@ -41,6 +41,4 @@ |
| 42 | 42 | |
| 43 | 43 | $wgEnableZeroRatedMobileAccessTesting = false; |
| 44 | 44 | |
| 45 | | -$wgExtZeroRatedMobileAccess = new ExtZeroRatedMobileAccess(); |
| 46 | | - |
| 47 | | -$wgHooks['BeforePageDisplay'][] = array( &$wgExtZeroRatedMobileAccess, 'beforePageDisplayHTML' ); |
| \ No newline at end of file |
| | 45 | +$wgHooks['BeforePageDisplay'][] = 'ExtZeroRatedMobileAccess::onBeforePageDisplay'; |
| Index: branches/wmf/1.19wmf1/extensions/ZeroRatedMobileAccess/ZeroRatedMobileAccess.body.php |
| — | — | @@ -16,6 +16,11 @@ |
| 17 | 17 | private static $forceClickToViewImages; |
| 18 | 18 | public static $useFormat; |
| 19 | 19 | |
| | 20 | + public static function onBeforePageDisplay( &$out, &$text ) { |
| | 21 | + $ext = new ExtZeroRatedMobileAccess(); |
| | 22 | + return $ext->beforePageDisplayHTML( $out, $text ); |
| | 23 | + } |
| | 24 | + |
| 20 | 25 | /** |
| 21 | 26 | * Handler for the BeforePageDisplay hook |
| 22 | 27 | * |