r111428 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r111427‎ | r111428 | r111429 >
Date:22:38, 13 February 2012
Author:werdna
Status:ok
Tags:brion 
Comment:
Fix ACW to work with new hook signature introduced in r111427
Modified paths:
  • /trunk/extensions/ArticleCreationWorkflow/ArticleCreationWorkflow.hooks.php (modified) (history)
  • /trunk/extensions/ArticleCreationWorkflow/includes/ArticleCreationUtil.php (modified) (history)

Diff [purge]

Index: trunk/extensions/ArticleCreationWorkflow/includes/ArticleCreationUtil.php
@@ -18,8 +18,8 @@
1919
2020 $bucketConfig = array(
2121 'buckets' => array(
22 - 'on' => 1,
23 - 'off' => 99,
 22+ 'on' => 99,
 23+ 'off' => 1,
2424 ),
2525 'version' => 1,
2626 );
Index: trunk/extensions/ArticleCreationWorkflow/ArticleCreationWorkflow.hooks.php
@@ -47,16 +47,7 @@
4848 /**
4949 * Customized html that shows an article doesn't exist
5050 */
51 - public static function BeforeDisplayNoArticleText( $article, &$text, $errors, $wgUser, &$wikiText ) {
52 - // global $wgGroupPermissions;
53 - //
54 - // // Show the custom page if there is no error or the user is not loggin and anonmyous edit
55 - // // is not allowed
56 - // if ( !count( $errors ) || ( $wgUser->isAnon() && !$wgGroupPermissions['*']['edit'] ) ) {
57 - // $text = ArticleCreationTemplates::showMissingPage( $article );
58 - // $wikiText = false;
59 - // }
60 - // return false;
 51+ public static function BeforeDisplayNoArticleText( $article ) {
6152 global $wgOut;
6253
6354 if ( ArticleCreationUtil::isEnabled() ) {
@@ -71,6 +62,7 @@
7263
7364 $vars['acConfig'] = $wgArticleCreationConfig +
7465 array(
 66+ 'enabled' => ArticleCreationUtil::isEnabled(),
7567 'tracking-turned-on' => ArticleCreationUtil::trackingEnabled(),
7668 'tracking-code-prefix' => ArticleCreationUtil::trackingCodePrefix(),
7769 );

Sign-offs

UserFlagDate
Raindriftinspected18:44, 17 February 2012

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r111427Port (with changes) r110866 to trunk. Reviewed by Brion before commit.werdna22:32, 13 February 2012

Status & tagging log