Several minor fixes.

- Add missing wfProfileOut( __METHOD__ ); in FSFile.php [13ae6bfb]
- Remove unused $IP globals in ApiUpload.php [fbf34d84]
- Remove empty statement in EditPage.php [375687ed]

Change-Id: I3b0506e3c8fc89b352a0d72f18e51a1223af0e9b

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 6aed2d3..d42edd7 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1167,7 +1167,7 @@ class EditPage {
         * since the post-edit state should only apply to the load right after the save.
         */
        protected function setPostEditCookie() {
-               global $wgCookiePrefix, $wgCookieDomain;;
+               global $wgCookiePrefix, $wgCookieDomain;
                $revisionId = $this->mArticle->getLatest();
                $postEditKey = self::POST_EDIT_COOKIE_KEY_PREFIX . $revisionId;
 

diff --git a/includes/api/ApiUpload.php b/includes/api/ApiUpload.php
index 6ec3a71..eabcf9b 100644 (file)
--- a/includes/api/ApiUpload.php
+++ b/includes/api/ApiUpload.php
@@ -184,8 +184,6 @@ class ApiUpload extends ApiBase {
         * @return array
         */
        private function getChunkResult( $warnings ) {
-               global $IP;
-
                $result = array();
 
                $result['result'] = 'Continue';
@@ -564,8 +562,6 @@ class ApiUpload extends ApiBase {
         * @return array
         */
        protected function performUpload( $warnings ) {
-               global $IP;
-
                // Use comment as initial page text by default
                if ( is_null( $this->mParams['text'] ) ) {
                        $this->mParams['text'] = $this->mParams['comment'];

diff --git a/includes/filebackend/FSFile.php b/includes/filebackend/FSFile.php
index a6b6200..17a88c6 100644 (file)
--- a/includes/filebackend/FSFile.php
+++ b/includes/filebackend/FSFile.php
@@ -201,6 +201,7 @@ class FSFile {
                wfProfileIn( __METHOD__ );
 
                if ( $this->sha1Base36 !== null && !$recache ) {
+                       wfProfileOut( __METHOD__ );
                        return $this->sha1Base36;
                }