Allow the submit callback function to return a Status object (will use this later...

diff --git a/includes/HTMLForm.php b/includes/HTMLForm.php
index c51a9a8..fff1b40 100644 (file)
--- a/includes/HTMLForm.php
+++ b/includes/HTMLForm.php
@@ -209,7 +209,9 @@ class HTMLForm {
                        $result = $this->trySubmit();
                }
 
-               if ( $result === true ) {
+               if ( $result === true ||
+                       ( $result instanceof Status && $result->isGood() ) )
+               {
                        return $result;
                }
 
@@ -460,7 +462,10 @@ class HTMLForm {
         * @return String
         */
        function getErrors( $errors ) {
-               if ( is_array( $errors ) ) {
+               if ( $errors instanceof Status ) {
+                       global $wgOut;
+                       $errorstr = $wgOut->parse( $errors->getWikiText() );
+               } elseif ( is_array( $errors ) ) {
                        $errorstr = $this->formatErrors( $errors );
                } else {
                        $errorstr = $errors;

diff --git a/includes/Preferences.php b/includes/Preferences.php
index b9b120c..deb17d0 100644 (file)
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -1328,7 +1328,7 @@ class Preferences {
                        $wgOut->redirect( $url );
                }
 
-               return true;
+               return Status::newGood();
        }
 
        public static function loadOldSearchNs( $user ) {