Fix some places where globals where used without being declared as

being global. Also remove one unused variable.

diff --git a/includes/User.php b/includes/User.php
index 00c8981..6734c32 100644 (file)
--- a/includes/User.php
+++ b/includes/User.php
@@ -1961,6 +1961,7 @@ class User {
         * Logout user.
         */
        function logout() {
+               global $wgUser;
                if( wfRunHooks( 'UserLogout', array(&$this) ) ) {
                        $this->doLogout();
                        wfRunHooks( 'UserLogoutComplete', array(&$wgUser) );

diff --git a/includes/api/ApiParse.php b/includes/api/ApiParse.php
index 39382f3..4e94754 100644 (file)
--- a/includes/api/ApiParse.php
+++ b/includes/api/ApiParse.php
@@ -42,7 +42,6 @@ class ApiParse extends ApiBase {
                $params = $this->extractRequestParams();
                $text = $params['text'];
                $title = $params['title'];
-               $retval = '';
 
                //Create title for parser
                $title_obj = Title :: newFromText($params['title']);