r56901 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r56900‎ | r56901 | r56902 >
Date:21:56, 24 September 2009
Author:brion
Status:ok
Tags:
Comment:
Merge r56899 - fix for recursion loop in ProofreadPage
Modified paths:
  • /branches/wmf-deployment/extensions/ProofreadPage (modified) (history)
  • /branches/wmf-deployment/extensions/ProofreadPage/ProofreadPage.php (modified) (history)

Diff [purge]

Index: branches/wmf-deployment/extensions/ProofreadPage/ProofreadPage.php
@@ -711,6 +711,10 @@
712712 $to = $args['to'];
713713 $header = $args['header'];
714714
 715+ # abort if the tag is on an index page
 716+ if ( preg_match( "/^$index_namespace:(.*?)(\/([0-9]*)|)$/", $wgTitle->getPrefixedText() ) ) {
 717+ return "";
 718+ }
715719 if( ! $index ) {
716720 return '<strong class="error">' . wfMsgForContent( 'proofreadpage_index_expected' ) . '</strong>';
717721 }
Property changes on: branches/wmf-deployment/extensions/ProofreadPage
___________________________________________________________________
Name: svn:mergeinfo
718722 - /branches/REL1_15/phase3/extensions/ProofreadPage:51646
/trunk/extensions/ProofreadPage:56207,56209,56296,56333,56355,56763-56882
/trunk/phase3/extensions/ProofreadPage:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350
719723 + /branches/REL1_15/phase3/extensions/ProofreadPage:51646
/trunk/extensions/ProofreadPage:56207,56209,56296,56333,56355,56763-56882,56899
/trunk/phase3/extensions/ProofreadPage:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r56899do not allow 'pages' command on index pagesthomasv21:48, 24 September 2009

Status & tagging log