https://www.mediawiki.org/wiki/Special:Code/MediaWiki/112768
Revision: 112768
Author: johnduhart
Date: 2012-03-01 03:11:41 +0000 (Thu, 01 Mar 2012)
Log Message:
-----------
Removed hook for adding configuration variables, use addJsConfigVars instead
Modified Paths:
--------------
trunk/extensions/ArticleCreationWorkflow/ArticleCreationWorkflow.hooks.php
trunk/extensions/ArticleCreationWorkflow/ArticleCreationWorkflow.php
trunk/extensions/ArticleCreationWorkflow/SpecialArticleCreationLanding.php
Modified:
trunk/extensions/ArticleCreationWorkflow/ArticleCreationWorkflow.hooks.php
===================================================================
--- trunk/extensions/ArticleCreationWorkflow/ArticleCreationWorkflow.hooks.php
2012-03-01 03:11:39 UTC (rev 112767)
+++ trunk/extensions/ArticleCreationWorkflow/ArticleCreationWorkflow.hooks.php
2012-03-01 03:11:41 UTC (rev 112768)
@@ -61,25 +61,6 @@
return true;
}
- public static function getGlobalVariables( &$vars ) {
- global $wgArticleCreationConfig, $wgUser,
$wgArticleCreationButtons, $wgTitle;
-
- if ( ! $wgTitle->isSpecial( 'ArticleCreationLanding' ) ) {
- return true;
- }
-
- $vars['acConfig'] = $wgArticleCreationConfig +
- array(
- 'enabled' => ArticleCreationUtil::isEnabled(),
- 'tracking-turned-on' =>
ArticleCreationUtil::trackingEnabled(),
- 'tracking-code-prefix' =>
ArticleCreationUtil::trackingCodePrefix(),
- 'variant' =>
ArticleCreationTemplates::getLandingVariant( $wgTitle ),
- 'acwbucket' =>
ArticleCreationUtil::trackingBucket(),
- );
-
- return true;
- }
-
public static function configSearchTitle( &$vars ) {
global $wgRequest;
Modified: trunk/extensions/ArticleCreationWorkflow/ArticleCreationWorkflow.php
===================================================================
--- trunk/extensions/ArticleCreationWorkflow/ArticleCreationWorkflow.php
2012-03-01 03:11:39 UTC (rev 112767)
+++ trunk/extensions/ArticleCreationWorkflow/ArticleCreationWorkflow.php
2012-03-01 03:11:41 UTC (rev 112768)
@@ -33,8 +33,6 @@
$wgHooks['ArticleSaveComplete'][] = 'ArticleCreationHooks::trackEditSuccess';
$wgHooks['EditPage::attemptSave'][] = 'ArticleCreationHooks::trackEditAttempt';
-$wgHooks['MakeGlobalVariablesScript'][] =
'ArticleCreationHooks::getGlobalVariables';
-
/* Internationalization */
$wgExtensionMessagesFiles['ArticleCreation'] = $articleCreationDir .
'ArticleCreationWorkflow.i18n.php';
Modified:
trunk/extensions/ArticleCreationWorkflow/SpecialArticleCreationLanding.php
===================================================================
--- trunk/extensions/ArticleCreationWorkflow/SpecialArticleCreationLanding.php
2012-03-01 03:11:39 UTC (rev 112767)
+++ trunk/extensions/ArticleCreationWorkflow/SpecialArticleCreationLanding.php
2012-03-01 03:11:41 UTC (rev 112768)
@@ -33,9 +33,27 @@
$out->setRobotPolicy( 'noindex,nofollow' );
$out->addModules( 'ext.articleCreation.core' );
$out->addModules( 'ext.articleCreation.user' );
+ $out->addJsConfigVars( 'acConfig', $this->getConfigVars() );
$out->addHtml( ArticleCreationTemplates::getLandingPage($par) );
ArticleCreationUtil::TrackSpecialLandingPage( $par );
}
+
+ /**
+ * Returns the javascript configuration
+ *
+ * @return array
+ */
+ protected function getConfigVars() {
+ global $wgArticleCreationConfig;
+
+ return $wgArticleCreationConfig + array(
+ 'enabled' => ArticleCreationUtil::isEnabled(),
+ 'tracking-turned-on' =>
ArticleCreationUtil::trackingEnabled(),
+ 'tracking-code-prefix' =>
ArticleCreationUtil::trackingCodePrefix(),
+ 'variant' =>
ArticleCreationTemplates::getLandingVariant( $this->getTitle() ),
+ 'acwbucket' =>
ArticleCreationUtil::trackingBucket(),
+ );
+ }
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
