Merge "multi dbms support in api"

diff --cc includes/api/ApiBlock.php
index 9a2f255,d7f121f..e229ef0
--- 1/includes/api/ApiBlock.php
--- 2/includes/api/ApiBlock.php
+++ b/includes/api/ApiBlock.php
@@@ -100,10 -100,9 +100,10 @@@ class ApiBlock extends ApiBase 
  
                $block = Block::newFromTarget( $target );
                if( $block instanceof Block ){
-                       $res['expiry'] = $block->mExpiry == wfGetDB( DB_SLAVE )->getInfinity()
+                       $res['expiry'] = $block->mExpiry == $this->getDB()->getInfinity()
                                ? 'infinite'
                                : wfTimestamp( TS_ISO_8601, $block->mExpiry );
 +                      $res['id'] = $block->getId();
                } else {
                        # should be unreachable
                        $res['expiry'] = '';

diff --cc includes/api/ApiProtect.php
Simple merge

diff --cc includes/api/ApiQueryAllLinks.php
Simple merge

diff --cc includes/api/ApiQueryAllUsers.php
Simple merge

diff --cc includes/api/ApiQueryBacklinks.php
Simple merge

diff --cc includes/api/ApiQueryCategoryMembers.php
Simple merge

diff --cc includes/api/ApiQueryDeletedrevs.php
Simple merge

diff --cc includes/api/ApiQueryIWBacklinks.php
Simple merge

diff --cc includes/api/ApiQueryLangBacklinks.php
Simple merge

diff --cc includes/api/ApiQueryRevisions.php
index 426de6c,cf41c91..44cb46e
--- 1/includes/api/ApiQueryRevisions.php
--- 2/includes/api/ApiQueryRevisions.php
+++ b/includes/api/ApiQueryRevisions.php
@@@ -329,15 -322,12 +329,15 @@@ class ApiQueryRevisions extends ApiQuer
                                $pageid = intval( $cont[0] );
                                $revid = intval( $cont[1] );
                                $this->addWhere(
-                                       "rev_page > '$pageid' OR " .
-                                       "(rev_page = '$pageid' AND " .
-                                       "rev_id >= '$revid')"
+                                       "rev_page > $pageid OR " .
+                                       "(rev_page = $pageid AND " .
+                                       "rev_id >= $revid)"
                                );
                        }
 -                      $this->addOption( 'ORDER BY', 'rev_page, rev_id' );
 +                      $this->addOption( 'ORDER BY', array(
 +                              'rev_page',
 +                              'rev_id'
 +                      ));
  
                        // assumption testing -- we should never get more then $pageCount rows.
                        $limit = $pageCount;

diff --cc includes/api/ApiQueryWatchlistRaw.php
Simple merge