Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

API * version param now links to the SVN

Browse source 
* debug case fixes 
* renamed ApiQueryContributions to ApiQueryUserContributions (a bit clearer)
This commit is contained in:
Yuri Astrakhan 2006-11-04 05:24:59 +00:00
parent d201dbf9b7
commit b900efa97f
5 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
includes/AutoLoader.php
View file

@ -256,7 +256,7 @@ function __autoload($className) {
'ApiQueryAllpages' => 'includes/api/ApiQueryAllpages.php', 'ApiQueryAllpages' => 'includes/api/ApiQueryAllpages.php',
'ApiQueryBase' => 'includes/api/ApiQueryBase.php', 'ApiQueryBase' => 'includes/api/ApiQueryBase.php',
'ApiQueryBacklinks' => 'includes/api/ApiQueryBacklinks.php', 'ApiQueryBacklinks' => 'includes/api/ApiQueryBacklinks.php',
'ApiQueryContributions' => 'includes/api/ApiQueryContributions.php', 'ApiQueryContributions' => 'includes/api/ApiQueryUserContributions.php',
'ApiQueryInfo' => 'includes/api/ApiQueryInfo.php', 'ApiQueryInfo' => 'includes/api/ApiQueryInfo.php',
'ApiQueryLogEvents' => 'includes/api/ApiQueryLogEvents.php', 'ApiQueryLogEvents' => 'includes/api/ApiQueryLogEvents.php',
'ApiQueryRecentChanges'=> 'includes/api/ApiQueryRecentChanges.php', 'ApiQueryRecentChanges'=> 'includes/api/ApiQueryRecentChanges.php',

12
includes/api/ApiBase.php
View file

@ -150,8 +150,18 @@ abstract class ApiBase {
if ($this->getMain()->getShowVersions()) { if ($this->getMain()->getShowVersions()) {
$versions = $this->getVersion(); $versions = $this->getVersion();
if (is_array($versions)) $pattern = '(\$.*) ([0-9a-z_]+\.php) (.*\$)';
$replacement = '\\0' . "\n " . 'http://svn.wikimedia.org/viewvc/mediawiki/trunk/phase3/includes/api/\\2';
if (is_array($versions)) {
$ver2 = array();
foreach ($versions as &$v)
$v = eregi_replace($pattern, $replacement, $v);
$versions = implode("\n ", $versions); $versions = implode("\n ", $versions);
}
else
$versions = eregi_replace($pattern, $replacement, $versions);
$msg .= "Version:\n $versions\n"; $msg .= "Version:\n $versions\n";
} }
} }

6
includes/api/ApiPageSet.php
View file

@ -358,7 +358,7 @@ class ApiPageSet extends ApiQueryBase {
*/ */
private function initFromQueryResult($db, $res, &$remaining = null, $processTitles = null) { private function initFromQueryResult($db, $res, &$remaining = null, $processTitles = null) {
if (!is_null($remaining) && is_null($processTitles)) if (!is_null($remaining) && is_null($processTitles))
ApiBase :: dieDebug('Missing $processTitles parameter when $remaining is provided'); ApiBase :: dieDebug(__METHOD__, 'Missing $processTitles parameter when $remaining is provided');
while ($row = $db->fetchObject($res)) { while ($row = $db->fetchObject($res)) {
@ -431,7 +431,7 @@ class ApiPageSet extends ApiQueryBase {
// Populate all the page information // Populate all the page information
if($this->mResolveRedirects) if($this->mResolveRedirects)
$this->dieDebug('revids may not be used with redirect resolution'); ApiBase :: dieDebug(__METHOD__, 'revids may not be used with redirect resolution');
$this->initFromPageIds(array_keys($pageids)); $this->initFromPageIds(array_keys($pageids));
} }
@ -527,7 +527,7 @@ class ApiPageSet extends ApiQueryBase {
// All IDs must exist in the page table // All IDs must exist in the page table
if (!empty($this->mPendingRedirectIDs[$plfrom])) if (!empty($this->mPendingRedirectIDs[$plfrom]))
$this->dieDebug('Invalid redirect IDs were found'); ApiBase :: dieDebug(__METHOD__, 'Invalid redirect IDs were found');
return $linkBatch; return $linkBatch;
} }

2
includes/api/ApiQueryBacklinks.php
View file

@ -95,7 +95,7 @@ class ApiQueryBacklinks extends ApiQueryGeneratorBase {
extract($this->extractRequestParams()); extract($this->extractRequestParams());
if ($redirect) if ($redirect)
$this->dieDebug('Redirect is not yet been implemented', 'notimplemented'); ApiBase :: dieDebug(__METHOD__, 'Redirect is not yet been implemented', 'notimplemented');
$this->processContinue($continue, $redirect); $this->processContinue($continue, $redirect);

2
includes/api/ApiQueryContributions.php → includes/api/ApiQueryUserContributions.php
View file

@ -166,7 +166,7 @@ class ApiQueryContributions extends ApiQueryBase {
} }
public function getVersion() { public function getVersion() {
return __CLASS__ . ': $Id: ApiQueryContributions.php 17335 2006-11-01 09:36:00Z Werdna $'; return __CLASS__ . ': $Id$';
} }
} }
?> ?>