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

Revision: 73631
Author:   ialex
Date:     2010-09-23 19:33:50 +0000 (Thu, 23 Sep 2010)

Log Message:
-----------
* Corrected link URL generation for the sidebar: the query can directly be 
passed to getLocalUrl()
* Added alias file
* Fixed E_STRICT about SpecialVariablePage::execute()'s signature

Modified Paths:
--------------
    trunk/extensions/VariablePage/VariablePage.body.php
    trunk/extensions/VariablePage/VariablePage.php

Added Paths:
-----------
    trunk/extensions/VariablePage/VariablePage.alias.php

Added: trunk/extensions/VariablePage/VariablePage.alias.php
===================================================================
--- trunk/extensions/VariablePage/VariablePage.alias.php                        
        (rev 0)
+++ trunk/extensions/VariablePage/VariablePage.alias.php        2010-09-23 
19:33:50 UTC (rev 73631)
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Aliases for special pages of VariablePage extension.
+ *
+ * @file
+ */
+
+$specialPageAliases = array();
+
+/** English
+ * @author Nike
+ */
+$specialPageAliases['en'] = array(
+       'VariablePage' => array( 'VariablePage' ),
+);
\ No newline at end of file


Property changes on: trunk/extensions/VariablePage/VariablePage.alias.php
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: trunk/extensions/VariablePage/VariablePage.body.php
===================================================================
--- trunk/extensions/VariablePage/VariablePage.body.php 2010-09-23 19:30:38 UTC 
(rev 73630)
+++ trunk/extensions/VariablePage/VariablePage.body.php 2010-09-23 19:33:50 UTC 
(rev 73631)
@@ -11,7 +11,7 @@
                }
        }
 
-       public function execute() {
+       public function execute( $par ) {
                global $wgOut, $wgRequest;
                global $wgVariablePagePossibilities;
 
@@ -51,7 +51,7 @@
                 * We use a # larger than 100 to increase 'randomness'
                 */
                $random_number = mt_rand( 0, 100*100 );
-               $offset = 0;  
+               $offset = 0;
 
                foreach ( $page_possibilities as $url => $probability ) {
                        $offset += $probability * 100;

Modified: trunk/extensions/VariablePage/VariablePage.php
===================================================================
--- trunk/extensions/VariablePage/VariablePage.php      2010-09-23 19:30:38 UTC 
(rev 73630)
+++ trunk/extensions/VariablePage/VariablePage.php      2010-09-23 19:33:50 UTC 
(rev 73631)
@@ -66,6 +66,7 @@
 
 $wgAutoloadClasses[ 'SpecialVariablePage' ] = $dir . 'VariablePage.body.php';
 $wgExtensionMessagesFiles[ 'VariablePage' ] = $dir . 'VariablePage.i18n.php';
+$wgExtensionAliasesFiles[ 'VariablePage' ] = $dir . 'VariablePage.alias.php';
 $wgSpecialPages[ 'VariablePage' ] = 'SpecialVariablePage';
 $wgSpecialPageGroups[ 'VariablePage' ] = 'contribution';
 
@@ -78,11 +79,10 @@
 
        // make sure that we should be showing a sidebar link
        if ( $wgVariablePageShowSidebarLink ) {
-               //$url = Title::makeTitle( NS_SPECIAL, wfMsg( 'variablepage' ) 
)->getLocalUrl();
-               $url = SpecialPage::getTitleFor( 'VariablePage')->getLocalUrl();
+               $title = SpecialPage::getTitleFor( 'VariablePage' );
                $bar['navigation'][] = array(
                        'text' => wfMsg( 'variablepage-navlink_text' ),
-                       'href' => wfAppendQuery( $url, 
$wgVariablePageSidebarLinkQuery ),
+                       'href' => $title->getLocalUrl( 
$wgVariablePageSidebarLinkQuery ),
                        'id' => 'n-variablepage',
                        'active' => true,
                );



_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to