Converts edit credentials API call to JSON format.

chnm · Mar 31, 2011 · 957a676 · 957a676
1 parent e985bd0
commit 957a676
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/lib/Scripto/Service/MediaWiki.php b/lib/Scripto/Service/MediaWiki.php
@@ -219,28 +219,28 @@ public function getPreview($wikitext)
     public function getEditCredentials($title)
     {
         // Get credentials. See: http://www.mediawiki.org/wiki/API:Edit_-_Create%26Edit_pages
-        self::getHttpClient()->setParameterPost('format', 'xml')
+        self::getHttpClient()->setParameterPost('format', 'json')
                              ->setParameterPost('action', 'query')
                              ->setParameterPost('prop', 'info|revisions')
                              ->setParameterPost('intoken', 'edit')
                              ->setParameterPost('titles', $title);
 
-        $response = self::getHttpClient()->request('POST')->getBody();
+        $response = json_decode(self::getHttpClient()->request('POST')->getBody(), true);
         self::getHttpClient()->resetParameters();
 
-        // Extract the edittoken.
-        $xml = new SimpleXMLElement($response);
-        $edittoken = (string) $xml->query->pages->page['edittoken'];
+        $page = current($response['query']['pages']);
 
-        // Return NULL if edittoken doesn't exist.
-        if (!$edittoken) {
+        // Extract the edittoken. Return NULL if edittoken doesn't exist.
+        if (!isset($page['edittoken'])) {
             return null;
         }
+        $edittoken = $page['edittoken'];
 
-        // Extract the timestamp of the last revision to protect against edit conflicts.
+        // Extract the timestamp of the last revision to protect against edit 
+        // conflicts. This API call returns only the last revision.
         $basetimestamp = null;
-        if (isset($xml->query->pages->page->revisions)) {
-            $basetimestamp = (string) $xml->query->pages->page->revisions->rev['timestamp'];
+        if (!isset($page['revisions'])) {
+            $basetimestamp = $page['revisions']['timestamp'];
         }
 
         return array('edittoken' => $edittoken, 'basetimestamp' => $basetimestamp);