dépôts / lhc / web / wiklou.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f85ea3f)
* Add class "disambiguationpage" to body tag
authorVictor Vasiliev <vasilievvv@users.mediawiki.org>
Sun, 9 Nov 2008 18:21:42 +0000 (18:21 +0000)
committerVictor Vasiliev <vasilievvv@users.mediawiki.org>
Sun, 9 Nov 2008 18:21:42 +0000 (18:21 +0000)
* Split off MediaWiki:Disambiguationspage parsing to
  wfGetDisambiguationTemplates()

RELEASE-NOTES patch | blob | history
includes/Article.php patch | blob | history
includes/GlobalFunctions.php patch | blob | history
includes/specials/SpecialDisambiguations.php patch | blob | history

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 6e33328..b45c9c8 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -200,6 +200,7 @@ The following extensions are migrated into MediaWiki 1.14:
   $wgMediaHandlers configuration variable.
 * New 'AbortDiffCache' hook can be used to cancel the caching of a diff
 * (bug 15835) Added Content-Style-Type meta tag
+* Add class="disambiguationpage" to <body> tag for disambiguations
 
 === Bug fixes in 1.14 ===
 
diff --git a/includes/Article.php b/includes/Article.php
index f64e9f4..c629c42 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -574,6 +574,20 @@ class Article {
                return $titleObj !== NULL;
        }
 
+       function isDisambig() {
+               global $wgParser;
+               $this->loadContent();
+               $output = $wgParser->parse( $this->fetchContent(), $this->mTitle, new ParserOptions() );
+               $templates = $output->getTemplates();
+               $disambigs = wfGetDisambiguationTemplates();
+               if( isset( $templates[NS_TEMPLATE] ) )
+                       foreach( $templates[NS_TEMPLATE] as $dbk => $id )
+                               foreach( $disambigs as $disambig )
+                                       if( $disambig->getDBkey() == $dbk )
+                                               return true;
+               return false;
+       }
+
        /**
         * Returns true if the currently-referenced revision is the current edit
         * to this page (and it exists).
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 67c64c9..eaa806c 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -2965,3 +2965,38 @@ function wfStripIllegalFilenameChars( $name ) {
        $name = preg_replace ( "/[^".Title::legalChars()."]|:/", '-', $name );
        return $name;
 }
+
+/**
+ * Fetches all disambiguation templates from MediaWiki:Disambiguationspage
+ */
+function wfGetDisambiguationTemplates() {
+       static $templates = null;
+       if( $templates )
+               return $templates;
+       $msgText = wfMsgForContent('disambiguationspage');
+       $templates = array();
+
+       # If the text can be treated as a title, use it verbatim.
+       # Otherwise, pull the titles from the links table
+       $dp = Title::newFromText($msgText);
+       if( $dp ) {
+               if($dp->getNamespace() != NS_TEMPLATE) {
+                       # FIXME we assume the disambiguation message is a template but
+                       # the page can potentially be from another namespace :/
+                       wfDebug("Mediawiki:disambiguationspage message does not refer to a template!\n");
+               }
+               $templates [] = $dp;
+       } else {
+                       # Get all the templates linked from the Mediawiki:Disambiguationspage
+                       # Originally used database, now uses parser
+                       global $wgParser;
+                       $output = $wgParser->parse( $msgText,
+                               Title::makeTitle( NS_MEDIAWIKI, 'Disambiguationspage' ), new ParserOptions() );
+                       $links = $output->getLinks();
+                       if( isset( $links[NS_TEMPLATE] ) )
+                               foreach( $links[NS_TEMPLATE] as $dbk => $id )
+                                       if( $id )
+                                               $templates[] = Title::makeTitle( NS_TEMPLATE, $dbk );
+       }
+       return $templates;
+}
diff --git a/includes/specials/SpecialDisambiguations.php b/includes/specials/SpecialDisambiguations.php
index 0a728b6..dbf27d0 100644 (file)
--- a/includes/specials/SpecialDisambiguations.php
+++ b/includes/specials/SpecialDisambiguations.php
@@ -24,36 +24,9 @@ class DisambiguationsPage extends PageQueryPage {
        function getSQL() {
                $dbr = wfGetDB( DB_SLAVE );
 
-               $dMsgText = wfMsgForContent('disambiguationspage');
-
                $linkBatch = new LinkBatch;
-
-               # If the text can be treated as a title, use it verbatim.
-               # Otherwise, pull the titles from the links table
-               $dp = Title::newFromText($dMsgText);
-               if( $dp ) {
-                       if($dp->getNamespace() != NS_TEMPLATE) {
-                               # FIXME we assume the disambiguation message is a template but
-                               # the page can potentially be from another namespace :/
-                               wfDebug("Mediawiki:disambiguationspage message does not refer to a template!\n");
-                       }
-                       $linkBatch->addObj( $dp );
-               } else {
-                               # Get all the templates linked from the Mediawiki:Disambiguationspage
-                               $disPageObj = Title::makeTitleSafe( NS_MEDIAWIKI, 'disambiguationspage' );
-                               $res = $dbr->select(
-                                       array('pagelinks', 'page'),
-                                       'pl_title',
-                                       array('page_id = pl_from', 'pl_namespace' => NS_TEMPLATE,
-                                               'page_namespace' => $disPageObj->getNamespace(), 'page_title' => $disPageObj->getDBkey()),
-                                       __METHOD__ );
-
-                               while ( $row = $dbr->fetchObject( $res ) ) {
-                                       $linkBatch->addObj( Title::makeTitle( NS_TEMPLATE, $row->pl_title ));
-                               }
-
-                               $dbr->freeResult( $res );
-               }
+               foreach( wfGetDisambiguationTemplates() as $tl )
+                       $linkBatch->addObj( $tl );
 
                $set = $linkBatch->constructSet( 'lb.tl', $dbr );
                if( $set === false ) {
Wiklou, le Wiki du Wiklou