Fix documentation for $wgUploadPath in DefaultSettings.php, it's $wgScriptPath/images...

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

diff --git a/includes/Status.php b/includes/Status.php
index 372f8c6..da22033 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();
@@ -127,6 +127,10 @@ class Status {
                $this->cleanCallback = false;
        }
 
+       /**
+        * @param $params array
+        * @return array
+        */
        protected function cleanParams( $params ) {
                if ( !$this->cleanCallback ) {
                        return $params;
@@ -138,20 +142,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 +220,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 );
                }
        }
 
@@ -287,11 +294,11 @@ class Status {
                }
                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
@@ -301,7 +308,7 @@ class Status {
                foreach ( $this->errors as $error ) {
                        if ( $error['type'] === $type ) {
                                $result[] = $error;
-                       }               
+                       }
                }
                return $result;
        }
@@ -322,10 +329,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;