Merge "Fix magic getter for $status->ok"

diff --git a/includes/Status.php b/includes/Status.php
index 61a0047..cd10258 100644 (file)
--- a/includes/Status.php
+++ b/includes/Status.php
@@ -437,7 +437,7 @@ class Status {
         */
        function __get( $name ) {
                if ( $name === 'ok' ) {
-                       return $this->sv->getOK();
+                       return $this->sv->isOK();
                } elseif ( $name === 'errors' ) {
                        return $this->sv->getErrors();
                }

diff --git a/tests/phpunit/includes/StatusTest.php b/tests/phpunit/includes/StatusTest.php
index 44463cf..c013f4f 100644 (file)
--- a/tests/phpunit/includes/StatusTest.php
+++ b/tests/phpunit/includes/StatusTest.php
@@ -56,6 +56,17 @@ class StatusTest extends MediaWikiLangTestCase {
                $this->assertEquals( $message, $status->getMessage()->getKey() );
        }
 
+       /**
+        *
+        */
+       public function testOkAndErrors() {
+               $status = Status::newGood( 'foo' );
+               $this->assertTrue( $status->ok );
+               $status = Status::newFatal( 'foo', 1, 2 );
+               $this->assertFalse( $status->ok );
+               $this->assertArrayEquals( array( array( 'type' => 'error', 'message' => 'foo', 'params' => array( 1, 2 ) ) ), $status->errors );
+       }
+
        /**
         * @dataProvider provideSetResult
         * @covers Status::setResult