MediaWiki 1.16.5-scripts

[autoinstalls/mediawiki.git] / includes / Status.php

diff --git a/includes/Status.php b/includes/Status.php
index 185ea6e5d77b9f34d133c65338019a5e26a3853f..a07a4b81f9c052a6484f07ce501981948252e003 100644 (file)
--- a/includes/Status.php
+++ b/includes/Status.php
@@ -84,6 +84,13 @@ class Status {
                $this->ok = false;
        }
 
+       /**
+        * Sanitize the callback parameter on wakeup, to avoid arbitrary execution.
+        */
+       function __wakeup() {
+               $this->cleanCallback = false;
+       }
+
        protected function cleanParams( $params ) {
                if ( !$this->cleanCallback ) {
                        return $params;
@@ -152,7 +159,7 @@ class Status {
                        if ( $longContext ) {
                                $s = wfMsgNoTrans( $longContext, $s );
                        } elseif ( $shortContext ) {
-                               $s = wfMsgNoTrans( $shortContext, "\n* $s\n" );
+                               $s = wfMsgNoTrans( $shortContext, "\n$s\n" );
                        }
                }
                return $s;
@@ -170,12 +177,15 @@ class Status {
                $this->successCount += $other->successCount;
                $this->failCount += $other->failCount;
        }
-       
+
        function getErrorsArray() {
                $result = array();
                foreach ( $this->errors as $error ) {
                        if ( $error['type'] == 'error' )
-                               $result[] = $error['message'];
+                               if( $error['params'] )
+                                       $result[] = array_merge( array( $error['message'] ), $error['params'] );
+                               else
+                                       $result[] = $error['message'];
                }
                return $result;
        }