Fix undefined variable in Status::getMessage()

If $shortContext and $longContext are false, and there
are errors, then $s is undefined.

Change-Id: Ie07f80b43a48a6fc4ed28b2c519f51fd32690bc8

diff --git a/includes/Status.php b/includes/Status.php
index ab24201..928f8eb 100644 (file)
--- a/includes/Status.php
+++ b/includes/Status.php
@@ -238,8 +238,14 @@ class Status {
                        }
                } else {
                        $msgs =  $this->getErrorMessageArray( $this->errors );
-                       $wrapper = new RawMessage( '* $' . implode( "\n* \$", range( 1, count( $msgs ) + 1 ) ) );
-                       $wrapper->params( $msgs )->parse();
+                       $msgCount = count( $msgs );
+
+                       if ( $shortContext ) {
+                               $msgCount++;
+                       }
+
+                       $wrapper = new RawMessage( '* $' . implode( "\n* \$", range( 1, $msgCount ) ) );
+                       $s = $wrapper->params( $msgs )->parse();
 
                        if ( $longContext ) {
                                $s = wfMessage( $longContext, $wrapper );
@@ -249,6 +255,7 @@ class Status {
                                $s = wfMessage( $shortContext, $wrapper );
                        }
                }
+
                return $s;
        }