r70500 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r70499‎ | r70500 | r70501 >
Date:15:21, 5 August 2010
Author:reedy
Status:ok (Comments)
Tags:
Comment:
* (bug 23848) Add {{ARTICLEPATH}} Magic Word

Apply my patch, as it seems to be working when I tried it this time
Modified paths:
  • /trunk/phase3/RELEASE-NOTES (modified) (history)
  • /trunk/phase3/includes/MagicWord.php (modified) (history)
  • /trunk/phase3/includes/parser/Parser.php (modified) (history)
  • /trunk/phase3/languages/messages/MessagesEn.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/parser/Parser.php
@@ -2497,7 +2497,7 @@
24982498 */
24992499 function getVariableValue( $index, $frame=false ) {
25002500 global $wgContLang, $wgSitename, $wgServer, $wgServerName;
2501 - global $wgScriptPath, $wgStylePath;
 2501+ global $wgArticlePath, $wgScriptPath, $wgStylePath;
25022502
25032503 /**
25042504 * Some of these require message or data lookups and can be
@@ -2771,6 +2771,8 @@
27722772 case 'currentversion':
27732773 $value = SpecialVersion::getVersion();
27742774 break;
 2775+ case 'articlepath':
 2776+ return $wgArticlePath;
27752777 case 'sitename':
27762778 return $wgSitename;
27772779 case 'server':
Index: trunk/phase3/includes/MagicWord.php
@@ -60,6 +60,7 @@
6161 'numberofarticles',
6262 'numberoffiles',
6363 'numberofedits',
 64+ 'articlepath',
6465 'sitename',
6566 'server',
6667 'servername',
Index: trunk/phase3/languages/messages/MessagesEn.php
@@ -295,6 +295,7 @@
296296 'nse' => array( 0, 'NSE:' ),
297297 'localurl' => array( 0, 'LOCALURL:' ),
298298 'localurle' => array( 0, 'LOCALURLE:' ),
 299+ 'articlepath' => array( 0, 'ARTICLEPATH' ),
299300 'server' => array( 0, 'SERVER' ),
300301 'servername' => array( 0, 'SERVERNAME' ),
301302 'scriptpath' => array( 0, 'SCRIPTPATH' ),
Index: trunk/phase3/RELEASE-NOTES
@@ -132,6 +132,7 @@
133133 ** (bug 1211) Subcategories, ordinary pages, and files now page separately.
134134 ** When several pages are given the same sort key, they sort by their names
135135 instead of randomly.
 136+* (bug 23848) Add {{ARTICLEPATH}} Magic Word
136137
137138 === Bug fixes in 1.17 ===
138139 * (bug 17560) Half-broken deletion moved image files to deletion archive

Follow-up revisions

RevisionCommit summaryAuthorDate
r70503Followup r70500, apparently we use spaces there...reedy15:34, 5 August 2010
r70505Followup r70500 again. More crappy spacesreedy15:43, 5 August 2010

Comments

#Comment by Liangent (talk | contribs)   15:30, 5 August 2010

In MessagesEn.php, other lines use spaces while yours uses tabs.

Status & tagging log