Make getUserPermissionsErrors(Expensive) actually handle $result as documented

Fatal errors was caused by nesting the results one level too deep

diff --git a/includes/Title.php b/includes/Title.php
index ff4a213..8bdc183 100644 (file)
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -1272,12 +1272,12 @@ class Title {
                }
                // Check getUserPermissionsErrors hook
                if ( !wfRunHooks( 'getUserPermissionsErrors', array( &$this, &$user, $action, &$result ) ) ) {
-                       $errors[] = $this->resultToError( $errors, $result );
+                       $errors = $this->resultToError( $errors, $result );
                }
                // Check getUserPermissionsErrorsExpensive hook
                if ( $doExpensiveQueries && !( $short && count( $errors ) > 0 ) &&
                         !wfRunHooks( 'getUserPermissionsErrorsExpensive', array( &$this, &$user, $action, &$result ) ) ) {
-                       $errors[] = $this->resultToError( $errors, $result );
+                       $errors = $this->resultToError( $errors, $result );
                }
 
                return $errors;