| Index: branches/REL1_17/phase3/includes/json/Services_JSON.php |
| — | — | @@ -870,7 +870,12 @@ |
| 871 | 871 | function Services_JSON_Error($message = 'unknown error', $code = null, |
| 872 | 872 | $mode = null, $options = null, $userinfo = null) |
| 873 | 873 | { |
| 874 | | - |
| | 874 | + $this->message = $message; |
| 875 | 875 | } |
| | 876 | + |
| | 877 | + function __toString() |
| | 878 | + { |
| | 879 | + return $this->message; |
| | 880 | + } |
| 876 | 881 | } |
| 877 | 882 | } |
| Property changes on: branches/REL1_17/phase3/includes/json/Services_JSON.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 878 | 883 | Merged /trunk/phase3/includes/json/Services_JSON.php:r89553 |
| Property changes on: branches/REL1_17/phase3/includes/json |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 879 | 884 | Merged /branches/sqlite/includes/json:r58211-58321 |
| 880 | 885 | Merged /trunk/phase3/includes/json:r82474,82845,82847-82848,85752,89553 |
| 881 | 886 | Merged /branches/new-installer/phase3/includes/json:r43664-66004 |
| 882 | 887 | Merged /branches/wmf-deployment/includes/json:r53381 |
| 883 | 888 | Merged /branches/REL1_15/phase3/includes/json:r51646 |
| Index: branches/REL1_17/phase3/includes/api/ApiEditPage.php |
| — | — | @@ -63,11 +63,7 @@ |
| 64 | 64 | $oldTitle = $titleObj; |
| 65 | 65 | |
| 66 | 66 | $titles = Title::newFromRedirectArray( Revision::newFromTitle( $oldTitle )->getText( Revision::FOR_THIS_USER ) ); |
| 67 | | - //array_shift( $titles ); |
| 68 | | - |
| 69 | | - $this->getResult()->addValue( null, 'foo', $titles ); |
| 70 | | - |
| 71 | | - |
| | 67 | + |
| 72 | 68 | $redirValues = array(); |
| 73 | 69 | foreach ( $titles as $id => $newTitle ) { |
| 74 | 70 | |
| Index: branches/REL1_17/phase3/RELEASE-NOTES |
| — | — | @@ -47,6 +47,8 @@ |
| 48 | 48 | * (bug 29233) Fixed failover for DB slave servers. When a DB slave went down, |
| 49 | 49 | an error was immediately shown to the user, instead of trying another slave. |
| 50 | 50 | Was broken since 1.17 beta 1. |
| | 51 | +* (bug 29278) server error 500 when attempting to add text to a page via redirect |
| | 52 | + (redirect points to the page and page is edited) |
| 51 | 53 | |
| 52 | 54 | === Changes since 1.17 beta 1 === |
| 53 | 55 | |
| — | — | @@ -62,7 +64,7 @@ |
| 63 | 65 | * When installing on PostgreSQL and the install account is the same as the web |
| 64 | 66 | account, check to make sure that the account has suitable privileges in the |
| 65 | 67 | mediawiki schema. |
| 66 | | -* (Bug 28172) Fixed error in PostgreSQL installation when creating the wiki |
| | 68 | +* (bug 28172) Fixed error in PostgreSQL installation when creating the wiki |
| 67 | 69 | sysop account. |
| 68 | 70 | * Fixed an issue with the Oracle installer in cases where the user is different |
| 69 | 71 | to the database name. |