bug 36087: PostgresUpdater fails on 8.3.14

[lhc/web/wiklou.git] / includes / Status.php

diff --git a/includes/Status.php b/includes/Status.php
index f285cf7..835b2ed 100644 (file)
--- a/includes/Status.php
+++ b/includes/Status.php
@@ -18,7 +18,7 @@ class Status {
 
        /** Counters for batch operations */
        public $successCount = 0, $failCount = 0;
-       /** Array to indicate which items of the batch operations failed */
+       /** Array to indicate which items of the batch operations were successful */
        public $success = array();
 
        /*semi-private*/ var $errors = array();
@@ -28,6 +28,7 @@ class Status {
         * Factory function for fatal errors
         *
         * @param $message String: message name
+        * @return Status
         */
        static function newFatal( $message /*, parameters...*/ ) {
                $params = func_get_args();
@@ -41,6 +42,7 @@ class Status {
         * Factory function for good results
         *
         * @param $value Mixed
+        * @return Status
         */
        static function newGood( $value = null ) {
                $result = new self;
@@ -51,7 +53,7 @@ class Status {
        /**
         * Change operation result
         *
-        * @param $ok Boolean: whether to operation completed
+        * @param $ok Boolean: whether the operation completed
         * @param $value Mixed
         */
        function setResult( $ok, $value = null ) {
@@ -127,6 +129,10 @@ class Status {
                $this->cleanCallback = false;
        }
 
+       /**
+        * @param $params array
+        * @return array
+        */
        protected function cleanParams( $params ) {
                if ( !$this->cleanCallback ) {
                        return $params;
@@ -138,20 +144,25 @@ class Status {
                return $cleanParams;
        }
 
+       /**
+        * @param $item
+        * @return string
+        */
        protected function getItemXML( $item ) {
                $params = $this->cleanParams( $item['params'] );
                $xml = "<{$item['type']}>\n" .
                        Xml::element( 'message', null, $item['message'] ) . "\n" .
-                       Xml::element( 'text', null, wfMsgReal( $item['message'], $params ) ) ."\n";
+                       Xml::element( 'text', null, wfMsg( $item['message'], $params ) ) ."\n";
                foreach ( $params as $param ) {
                        $xml .= Xml::element( 'param', null, $param );
                }
-               $xml .= "</{$this->type}>\n";
+               $xml .= "</{$item['type']}>\n";
                return $xml;
        }
 
        /**
         * Get the error list as XML
+        * @return string
         */
        function getXML() {
                $xml = "<errors>\n";
@@ -211,17 +222,15 @@ class Status {
        protected function getWikiTextForError( $error ) {
                if ( is_array( $error ) ) {
                        if ( isset( $error['message'] ) && isset( $error['params'] ) ) {
-                               return wfMsgReal( $error['message'],
-                                       array_map( 'wfEscapeWikiText', $this->cleanParams( $error['params'] ) ),
-                                       true, false, false );
+                               return wfMsgNoTrans( $error['message'],
+                                       array_map( 'wfEscapeWikiText', $this->cleanParams( $error['params'] ) )  );
                        } else {
                                $message = array_shift($error);
-                               return wfMsgReal( $message,
-                                       array_map( 'wfEscapeWikiText', $this->cleanParams( $error ) ),
-                                       true, false, false );
+                               return wfMsgNoTrans( $message,
+                                       array_map( 'wfEscapeWikiText', $this->cleanParams( $error ) ) );
                        }
                } else {
-                       return wfMsgReal( $error, array(), true, false, false);
+                       return wfMsgNoTrans( $error );
                }
        }
 
@@ -281,12 +290,31 @@ class Status {
                                if( $error['params'] ) {
                                        $result[] = array_merge( array( $error['message'] ), $error['params'] );
                                } else {
-                                       $result[] = $error['message'];
+                                       $result[] = array( $error['message'] );
                                }
                        }
                }
                return $result;
        }
+
+       /**
+        * Returns a list of status messages of the given type, with message and
+        * params left untouched, like a sane version of getStatusArray
+        *
+        * @param $type String
+        *
+        * @return Array
+        */
+       public function getErrorsByType( $type ) {
+               $result = array();
+               foreach ( $this->errors as $error ) {
+                       if ( $error['type'] === $type ) {
+                               $result[] = $error;
+                       }
+               }
+               return $result;
+       }
+
        /**
         * Returns true if the specified message is present as a warning or error
         *
@@ -303,10 +331,12 @@ class Status {
        }
 
        /**
-        * If the specified source message exists, replace it with the specified 
+        * If the specified source message exists, replace it with the specified
         * destination message, but keep the same parameters as in the original error.
         *
         * Return true if the replacement was done, false otherwise.
+        *
+        * @return bool
         */
        function replaceMessage( $source, $dest ) {
                $replaced = false;
@@ -327,4 +357,11 @@ class Status {
        public function getMessage() {
                return $this->getWikiText();
        }
+
+       /**
+        * @return mixed
+        */
+       public function getValue() {
+               return $this->value;
+       }
 }