r63308 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r63307‎ | r63308 | r63309 >
Date:04:13, 6 March 2010
Author:aaron
Status:ok
Tags:
Comment:
MFT r61189, r60760 (needed for FlaggedRevs_alpha)
Modified paths:
  • /branches/wmf-deployment/docs (modified) (history)
  • /branches/wmf-deployment/docs/hooks.txt (modified) (history)
  • /branches/wmf-deployment/includes (modified) (history)
  • /branches/wmf-deployment/includes/EditPage.php (modified) (history)
  • /branches/wmf-deployment/includes/HistoryPage.php (modified) (history)

Diff [purge]

Index: branches/wmf-deployment/docs/hooks.txt
@@ -689,6 +689,10 @@
690690 $title: title of page being edited
691691 &$msg: localization message name, overridable. Default is either 'copyrightwarning' or 'copyrightwarning2'
692692
 693+'EditPageNoSuchSection': When a section edit request is given for an non-existent section
 694+&$editpage: The current EditPage object
 695+&$res: the HTML of the error text
 696+
693697 'EditPageTosSummary': Give a chance for site and per-namespace customizations
694698 of terms of service summary link that might exist separately from the copyright
695699 notice.
@@ -1108,6 +1112,7 @@
11091113 'PageHistoryLineEnding' : right before the end <li> is added to a history line
11101114 $row: the revision row for this line
11111115 $s: the string representing this parsed line
 1116+$classes: array containing the <li> element classes
11121117
11131118 'PageHistoryPager::getQueryInfo': when a history pager query parameter set
11141119 is constructed
Property changes on: branches/wmf-deployment/docs
___________________________________________________________________
Name: svn:mergeinfo
11151120 + /branches/REL1_15/phase3/docs:51646
/trunk/phase3/docs:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816,59718,60760,61189
Index: branches/wmf-deployment/includes/EditPage.php
@@ -1952,7 +1952,10 @@
19531953 $wgOut->setRobotPolicy( 'noindex,nofollow' );
19541954 $wgOut->setArticleRelated( false );
19551955
1956 - $wgOut->addWikiMsg( 'nosuchsectiontext', $this->section );
 1956+ $res = wfMsgExt( 'nosuchsectiontext', 'parse', $this->section );
 1957+ wfRunHooks( 'EditPageNoSuchSection', array( &$this, &$res ) );
 1958+ $wgOut->addHTML( $res );
 1959+
19571960 $wgOut->returnToMain( false, $wgTitle );
19581961 }
19591962
Property changes on: branches/wmf-deployment/includes/EditPage.php
___________________________________________________________________
Name: svn:mergeinfo
19601963 - /branches/REL1_15/phase3/includes/EditPage.php:51646
/branches/wmf-deployment/includes/EditPage.php:53381
/trunk/phase3/includes/EditPage.php:56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,56478,57154-57447,57530,57541,57602,57916,58151,58219,58633,58816,60704,61557
19611964 + /branches/REL1_15/phase3/includes/EditPage.php:51646
/branches/wmf-deployment/includes/EditPage.php:53381
/trunk/phase3/includes/EditPage.php:56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,56478,57154-57447,57530,57541,57602,57916,58151,58219,58633,58816,60704,60760,61189,61557
Index: branches/wmf-deployment/includes/HistoryPage.php
@@ -541,7 +541,7 @@
542542 $classes = array_merge( $classes, $newClasses );
543543 $s .= " $tagSummary";
544544
545 - wfRunHooks( 'PageHistoryLineEnding', array( $this, &$row , &$s ) );
 545+ wfRunHooks( 'PageHistoryLineEnding', array( $this, &$row , &$s, &$classes ) );
546546
547547 $attribs = array();
548548 if ( $classes ) {
Property changes on: branches/wmf-deployment/includes/HistoryPage.php
___________________________________________________________________
Name: svn:mergeinfo
549549 - /branches/REL1_15/phase3/includes/PageHistory.php:51646
/trunk/phase3/includes/HistoryPage.php:56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57470,57530,57541,57602,57916,58151,58219,58633,58816,60704,61557
550550 + /branches/REL1_15/phase3/includes/PageHistory.php:51646
/trunk/phase3/includes/HistoryPage.php:56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57470,57530,57541,57602,57916,58151,58219,58633,58816,60704,60760,61189,61557
Property changes on: branches/wmf-deployment/includes
___________________________________________________________________
Name: svn:mergeinfo
551551 - /branches/REL1_15/phase3/includes:51646
/branches/wmf-deployment/includes:53381
/trunk/phase3/includes:56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57530,57541,57602,57916,58151,58219,58633,58816,59718,60704,61557
552552 + /branches/REL1_15/phase3/includes:51646
/branches/wmf-deployment/includes:53381
/trunk/phase3/includes:56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57530,57541,57602,57916,58151,58219,58633,58816,59718,60704,60760,61189,61557

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r60760Follow up r60759: forgot to commit hook changeaaron01:21, 7 January 2010
r61189* EditPageNoSuchSection hook...aaron00:58, 18 January 2010

Status & tagging log