revert r107006

(bug 23427) Introduced {{PAGEID}} variable to expose page.page_id
[patch by Waldir]

diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19
index 11297ca..8edb4ae 100644 (file)
--- a/RELEASE-NOTES-1.19
+++ b/RELEASE-NOTES-1.19
@@ -109,7 +109,6 @@ production.
 * (bug 32512) Include 'associated namespace' checkbox on Special:Contributions
 * Added $wgSend404Code, true by default, which can be set to false to send a 
   200 status code instead of 404 for nonexistent articles.
-* (bug 23427) Introduced {{PAGEID}} variable to expose page.page_id.
 * (bug 33447) Link to the broken image tracking category from Special:Wantedfiles.
 * (bug 27724) Add timestamp to job queue.
 * (bug 30339) Implement SpecialPage for running javascript tests. Disabled by default, due to

diff --git a/includes/MagicWord.php b/includes/MagicWord.php
index 57cf4af..563d3a5 100644 (file)
--- a/includes/MagicWord.php
+++ b/includes/MagicWord.php
@@ -67,7 +67,6 @@ class MagicWord {
                'numberoffiles',
                'numberofedits',
                'articlepath',
-               'pageid',
                'sitename',
                'server',
                'servername',

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 2949dcc..2faf860 100644 (file)
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -2817,8 +2817,6 @@ class Parser {
                                break;
                        case 'articlepath':
                                return $wgArticlePath;
-                       case 'pageid':
-                               return $this->getTitle()->getArticleId();
                        case 'sitename':
                                return $wgSitename;
                        case 'server':

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index fd4644c..2c36bfe 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -287,7 +287,6 @@ $magicWords = array(
        'localurl'               => array( 0,    'LOCALURL:'              ),
        'localurle'              => array( 0,    'LOCALURLE:'             ),
        'articlepath'            => array( 0,    'ARTICLEPATH'            ),
-       'pageid'                 => array( 0,    'PAGEID'                 ),
        'server'                 => array( 0,    'SERVER'                 ),
        'servername'             => array( 0,    'SERVERNAME'             ),
        'scriptpath'             => array( 0,    'SCRIPTPATH'             ),