[MediaWiki-CVS] SVN: [89175] trunk/extensions/BreadCrumbs/BreadCrumbsFunctions.php

[ialex]

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89175

Revision: 89175
Author:   ialex
Date:     2011-05-30 16:01:14 +0000 (Mon, 30 May 2011)
Log Message:
-----------
Follow-up r89159:
* removed now unused variable
* completely break b/c since we now require Linker::link() to be static

Also renamed some variables to be more explicit

Modified Paths:
--------------
    trunk/extensions/BreadCrumbs/BreadCrumbsFunctions.php

Modified: trunk/extensions/BreadCrumbs/BreadCrumbsFunctions.php
===================================================================
--- trunk/extensions/BreadCrumbs/BreadCrumbsFunctions.php       2011-05-30 
15:57:01 UTC (rev 89174)
+++ trunk/extensions/BreadCrumbs/BreadCrumbsFunctions.php       2011-05-30 
16:01:14 UTC (rev 89175)
@@ -14,7 +14,7 @@
        die();
 }
 
-function fnBreadCrumbsShowHook( &$m_pageObj ) {
+function fnBreadCrumbsShowHook( &$article ) {
        global $wgOut, $wgUser;
        global $wgBreadCrumbsDelimiter, $wgBreadCrumbsCount, 
$wgBreadCrumbsShowAnons;
 
@@ -27,7 +27,7 @@
        # cache index of last element:
        $m_count = count( $m_BreadCrumbs ) - 1;
        # Title object for the page we're viewing
-       $title = $m_pageObj->getTitle();
+       $title = $article->getTitle();
 
        # check for doubles:
        if ( $m_count < 1 || $m_BreadCrumbs[ $m_count ] != 
$title->getPrefixedText() ) {
@@ -43,8 +43,6 @@
        # update cache:
        $m_count = count( $m_BreadCrumbs ) - 1;
 
-       # acquire a skin object:
-       $m_skin = $wgUser->getSkin();
        # build the breadcrumbs trail:
        $m_trail = '<div id="BreadCrumbsTrail">';
        for ( $i = 0; $i <= $m_count; $i++ ) {
@@ -64,11 +62,11 @@
 }
 
 # Entry point for the hook for printing the CSS:
-function fnBreadCrumbsOutputHook( &$m_pageObj, $m_parserOutput ) {
-       global $wgBreadCrumbsShowAnons, $wgUser;
+function fnBreadCrumbsOutputHook( &$outputPage, $parserOutput ) {
+       global $wgBreadCrumbsShowAnons;
 
-       if ( $wgBreadCrumbsShowAnons || $wgUser->isLoggedIn() ) {
-               $m_pageObj->addModules( 'ext.breadCrumbs' );
+       if ( $wgBreadCrumbsShowAnons || $outputPage->getUser()->isLoggedIn() ) {
+               $outputPage->addModules( 'ext.breadCrumbs' );
        }
 
        # Be nice:


_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs