* Removing a handful of unused globals.

* $stack is not modified in Profiler::calltreeCount(), no need to pass-by-ref.
* Add FIXME marker to non-cross-platform line.
* A freshly created string does not need to be returned by reference. [Xml::namespaceSelector() and HTMLnamespaceselector() ].

diff --git a/includes/Parser.php b/includes/Parser.php
index 8f04aa2..1d27f90 100644 (file)
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -722,7 +722,7 @@ class Parser
                $descriptorspec = array(
                        0 => array('pipe', 'r'),
                        1 => array('pipe', 'w'),
-                       2 => array('file', '/dev/null', 'a')
+                       2 => array('file', '/dev/null', 'a')  // FIXME: this line in UNIX-specific, it generates a warning on Windows, because /dev/null is not a valid Windows file.
                );
                $pipes = array();
                $process = proc_open("$wgTidyBin -config $wgTidyConf $wgTidyOpts$opts", $descriptorspec, $pipes);

diff --git a/includes/Profiler.php b/includes/Profiler.php
index 8485edb..8307690 100644 (file)
--- a/includes/Profiler.php
+++ b/includes/Profiler.php
@@ -287,7 +287,7 @@ class Profiler {
         * @return Integer
         * @private
         */
-       function calltreeCount(& $stack, $start) {
+       function calltreeCount($stack, $start) {
                $level = $stack[$start][1];
                $count = 0;
                for ($i = $start -1; $i >= 0 && $stack[$i][1] > $level; $i --) {

diff --git a/includes/ProtectionForm.php b/includes/ProtectionForm.php
index 56eae6e..2d9d31b 100644 (file)
--- a/includes/ProtectionForm.php
+++ b/includes/ProtectionForm.php
@@ -28,7 +28,7 @@ class ProtectionForm {
        var $mExpiry = null;
 
        function __construct( &$article ) {
-               global $wgRequest, $wgUser, $wgLang;
+               global $wgRequest, $wgUser;
                global $wgRestrictionTypes, $wgRestrictionLevels;
                $this->mArticle =& $article;
                $this->mTitle =& $article->mTitle;

diff --git a/includes/SpecialResetpass.php b/includes/SpecialResetpass.php
index cde582b..b83375f 100644 (file)
--- a/includes/SpecialResetpass.php
+++ b/includes/SpecialResetpass.php
@@ -68,7 +68,7 @@ class PasswordResetForm extends SpecialPage {
        }
        
        function showForm() {
-               global $wgOut, $wgUser, $wgLang, $wgRequest;
+               global $wgOut, $wgUser, $wgRequest;
                
                $self = SpecialPage::getTitleFor( 'Resetpass' );                
                $form  =

diff --git a/includes/Wiki.php b/includes/Wiki.php
index cb5cce5..e5849a1 100644 (file)
--- a/includes/Wiki.php
+++ b/includes/Wiki.php
@@ -148,7 +148,7 @@ class MediaWiki {
                {
                        $targetUrl = $title->getFullURL();
                        // Redirect to canonical url, make it a 301 to allow caching
-                       global $wgServer, $wgUsePathInfo;
+                       global $wgUsePathInfo;
                        if( $targetUrl == $wgRequest->getFullRequestURL() ) {
                                $message = "Redirect loop detected!\n\n" .
                                        "This means the wiki got confused about what page was " .

diff --git a/includes/Xml.php b/includes/Xml.php
index 30b9eac..4485626 100644 (file)
--- a/includes/Xml.php
+++ b/includes/Xml.php
@@ -69,7 +69,7 @@ class Xml {
         * @param $includehidden Bool: include hidden namespaces?
         * @return String: Html string containing the namespace selector
         */
-       public static function &namespaceSelector($selected = '', $allnamespaces = null, $includehidden=false) {
+       public static function namespaceSelector($selected = '', $allnamespaces = null, $includehidden=false) {
                global $wgContLang;
                if( $selected !== '' ) {
                        if( is_null( $selected ) ) {

diff --git a/includes/XmlFunctions.php b/includes/XmlFunctions.php
index cbdcf5c..326c495 100644 (file)
--- a/includes/XmlFunctions.php
+++ b/includes/XmlFunctions.php
@@ -15,7 +15,7 @@ function wfOpenElement( $element, $attribs = null ) {
 function wfCloseElement( $element ) {
        return "</$element>";
 }
-function &HTMLnamespaceselector($selected = '', $allnamespaces = null, $includehidden=false) {
+function HTMLnamespaceselector($selected = '', $allnamespaces = null, $includehidden=false) {
        return Xml::namespaceSelector( $selected, $allnamespaces, $includehidden );
 }
 function wfSpan( $text, $class, $attribs=array() ) {