Remove unreachable line in DifferenceEngine

Documentation for ObjectCache.php

Remove unused variables from CompareParsers and PreprocessDump

diff --git a/includes/ObjectCache.php b/includes/ObjectCache.php
index db22c07..6824d21 100644 (file)
--- a/includes/ObjectCache.php
+++ b/includes/ObjectCache.php
@@ -36,7 +36,9 @@ $wgCaches = array();
 
 /**
  * Get a cache object.
- * @param $inputType Integer: cache type, one the the CACHE_* constants. 
+ * @param $inputType Integer: cache type, one the the CACHE_* constants.
+ *
+ * @return BagOStuff
  */
 function &wfGetCache( $inputType ) {
        global $wgCaches, $wgMemCachedServers, $wgMemCachedDebug, $wgMemCachedPersistent;

diff --git a/includes/Skin.php b/includes/Skin.php
index 57e535f..f3e5669 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -23,7 +23,10 @@ abstract class Skin extends Linker {
        /**#@-*/
        protected $mRevisionId; // The revision ID we're looking at, null if not applicable.
        protected $skinname = 'standard';
-       // @todo Fixme: should be protected :-\
+       /**
+        * todo Fixme: should be protected :-\
+        * @var Title
+        */
        var $mTitle = null;
        protected $mRelevantTitle = null;
        protected $mRelevantUser = null;
@@ -1586,7 +1589,7 @@ abstract class Skin extends Linker {
                        $namespaceNotice = '';
                }
 
-               wfProfileOut( $fname );
+               wfProfileOut( __METHOD__ );
                return $namespaceNotice;
        }
 

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 0c5e9d3..6417784 100644 (file)
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -1091,7 +1091,7 @@ class SkinTemplate extends Skin {
                
                $content_actions = array();
                
-               foreach ( $content_navigation as $section => $links ) {
+               foreach ( $content_navigation as $links ) {
                        
                        foreach ( $links as $key => $value ) {
                                

diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php
index d73735d..63bcfb6 100644 (file)
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -770,7 +770,6 @@ CONTROL;
                $difftext = $wgContLang->unsegmentForDiff( $formatter->format( $diffs ) ) .
                wfProfileOut( __METHOD__ );
                return $difftext;
-               $this->debug();
        }
 
        /**

diff --git a/maintenance/compareParsers.php b/maintenance/compareParsers.php
index 069e55e..7e60071 100644 (file)
--- a/maintenance/compareParsers.php
+++ b/maintenance/compareParsers.php
@@ -32,7 +32,7 @@ require_once( dirname( __FILE__ ) . '/Maintenance.php' );
 class CompareParsers extends Maintenance {
 
        private $count = 0;
-       private $outputDirectory, $startTime;
+       private $startTime;
 
        public function __construct() {
                parent::__construct();

diff --git a/maintenance/preprocessDump.php b/maintenance/preprocessDump.php
index 0db5932..b52d288 100644 (file)
--- a/maintenance/preprocessDump.php
+++ b/maintenance/preprocessDump.php
@@ -30,7 +30,7 @@ require_once( dirname( __FILE__ ) . '/Maintenance.php' );
 class PreprocessDump extends Maintenance {
 
        private $count = 0;
-       private $outputDirectory, $startTime;
+       private $startTime;
 
        /* Variables for dressing up as a parser */
        public $mTitle = 'PreprocessDump';