r60692 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r60691‎ | r60692 | r60693 >
Date:20:49, 5 January 2010
Author:catrope
Status:ok
Tags:
Comment:
wmf-deployment: Merge r60685, r60686 from trunk (GlobalUsage fixes)
Modified paths:
  • /branches/wmf-deployment/extensions/GlobalUsage (modified) (history)
  • /branches/wmf-deployment/extensions/GlobalUsage/SpecialGlobalUsage.php (modified) (history)

Diff [purge]

Index: branches/wmf-deployment/extensions/GlobalUsage/SpecialGlobalUsage.php
@@ -45,7 +45,7 @@
4646 $html = Xml::openElement( 'form', array( 'action' => $wgScript ) ) . "\n";
4747 $html .= Xml::hidden( 'title', $this->getTitle()->getPrefixedText() ) . "\n";
4848 $formContent = "\t" . Xml::input( 'target', 40, is_null( $this->target ) ? ''
49 - : $this->target->getPrefixedText() )
 49+ : $this->target->getText() )
5050 . "\n\t" . Xml::element( 'input', array(
5151 'type' => 'submit',
5252 'value' => wfMsg( 'globalusage-ok' )
@@ -195,7 +195,7 @@
196196
197197 $skin = $wgUser->getSkin();
198198
199 - $target = $this->target->getPrefixedText();
 199+ $target = $this->target->getText();
200200 $limit = $query->getLimit();
201201 $fmtLimit = $wgLang->formatNum( $limit );
202202 $offset = $query->getOffsetString();
Property changes on: branches/wmf-deployment/extensions/GlobalUsage
___________________________________________________________________
Name: svn:mergeinfo
203203 - /branches/REL1_15/phase3/extensions/GlobalUsage:51646
/trunk/extensions/GlobalUsage:56207,56209,56296,56333,56355,58660-60605
/trunk/phase3/extensions/GlobalUsage:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816
204204 + /branches/REL1_15/phase3/extensions/GlobalUsage:51646
/trunk/extensions/GlobalUsage:56207,56209,56296,56333,56355,58660-60688
/trunk/phase3/extensions/GlobalUsage:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r60685Don't add the namespace in self links. This fixes navigation issues.btongminh20:09, 5 January 2010
r60686r60685, now properly testedbtongminh20:18, 5 January 2010

Status & tagging log