Revert r28215: incorrectly moved files

35 files changed, 70 insertions, 72 deletions

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index a24bbcca9374..ec533ffe8197 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -317,47 +317,45 @@ function __autoload($className) {
 		'ApiOpenSearch' => 'includes/api/ApiOpenSearch.php',
 		'ApiPageSet' => 'includes/api/ApiPageSet.php',
 		'ApiParse' => 'includes/api/ApiParse.php',
+		'ApiQuery' => 'includes/api/ApiQuery.php',
+		'ApiQueryAllpages' => 'includes/api/ApiQueryAllpages.php',
+		'ApiQueryAllLinks' => 'includes/api/ApiQueryAllLinks.php',
+		'ApiQueryAllUsers' => 'includes/api/ApiQueryAllUsers.php',
+		'ApiQueryBase' => 'includes/api/ApiQueryBase.php',
+		'ApiQueryGeneratorBase' => 'includes/api/ApiQueryBase.php',
+		'ApiQueryBacklinks' => 'includes/api/ApiQueryBacklinks.php',
+		'ApiQueryCategories' => 'includes/api/ApiQueryCategories.php',
+		'ApiQueryCategoryMembers' => 'includes/api/ApiQueryCategoryMembers.php',
+		'ApiQueryContributions' => 'includes/api/ApiQueryUserContributions.php',
+		'ApiQueryExternalLinks' => 'includes/api/ApiQueryExternalLinks.php',
+		'ApiQueryExtLinksUsage' => 'includes/api/ApiQueryExtLinksUsage.php',
+		'ApiQueryImages' => 'includes/api/ApiQueryImages.php',
+		'ApiQueryImageInfo' => 'includes/api/ApiQueryImageInfo.php',
+		'ApiQueryInfo' => 'includes/api/ApiQueryInfo.php',
+		'ApiQueryLangLinks' => 'includes/api/ApiQueryLangLinks.php',
+		'ApiQueryLinks' => 'includes/api/ApiQueryLinks.php',
+		'ApiQueryLogEvents' => 'includes/api/ApiQueryLogEvents.php',
+		'ApiQueryRecentChanges'=> 'includes/api/ApiQueryRecentChanges.php',
+		'ApiQueryRevisions' => 'includes/api/ApiQueryRevisions.php',
+		'ApiQuerySearch' => 'includes/api/ApiQuerySearch.php',
+		'ApiQueryAllmessages' => 'includes/api/ApiQueryAllmessages.php',
+		'ApiQuerySiteinfo' => 'includes/api/ApiQuerySiteinfo.php',
+		'ApiQueryUserInfo' => 'includes/api/ApiQueryUserInfo.php',
+		'ApiQueryWatchlist' => 'includes/api/ApiQueryWatchlist.php',
 		'ApiRender' => 'includes/api/ApiRender.php',
 		'ApiResult' => 'includes/api/ApiResult.php',
 
-		# Query API
-		'ApiQuery' => 'includes/api/query/ApiQuery.php',
-		'ApiQueryAllpages' => 'includes/api/query/ApiQueryAllpages.php',
-		'ApiQueryAllLinks' => 'includes/api/query/ApiQueryAllLinks.php',
-		'ApiQueryAllUsers' => 'includes/api/query/ApiQueryAllUsers.php',
-		'ApiQueryBase' => 'includes/api/query/ApiQueryBase.php',
-		'ApiQueryGeneratorBase' => 'includes/api/query/ApiQueryBase.php',
-		'ApiQueryBlocks' => 'includes/api/query/ApiQueryBlocks.php',
-		'ApiQueryBacklinks' => 'includes/api/query/ApiQueryBacklinks.php',
-		'ApiQueryCategories' => 'includes/api/query/ApiQueryCategories.php',
-		'ApiQueryCategoryMembers' => 'includes/api/query/ApiQueryCategoryMembers.php',
-		'ApiQueryContributions' => 'includes/api/query/ApiQueryUserContributions.php',
-		'ApiQueryDeletedrevs' => 'includes/api/query/ApiQueryDeletedrevs.php',
-		'ApiQueryExternalLinks' => 'includes/api/query/ApiQueryExternalLinks.php',
-		'ApiQueryExtLinksUsage' => 'includes/api/query/ApiQueryExtLinksUsage.php',
-		'ApiQueryImages' => 'includes/api/query/ApiQueryImages.php',
-		'ApiQueryImageInfo' => 'includes/api/query/ApiQueryImageInfo.php',
-		'ApiQueryInfo' => 'includes/api/query/ApiQueryInfo.php',
-		'ApiQueryLangLinks' => 'includes/api/query/ApiQueryLangLinks.php',
-		'ApiQueryLinks' => 'includes/api/query/ApiQueryLinks.php',
-		'ApiQueryLogEvents' => 'includes/api/query/ApiQueryLogEvents.php',
-		'ApiQueryRecentChanges'=> 'includes/api/query/ApiQueryRecentChanges.php',
-		'ApiQueryRevisions' => 'includes/api/query/ApiQueryRevisions.php',
-		'ApiQuerySearch' => 'includes/api/query/ApiQuerySearch.php',
-		'ApiQueryAllmessages' => 'includes/api/query/ApiQueryAllmessages.php',
-		'ApiQuerySiteinfo' => 'includes/api/query/ApiQuerySiteinfo.php',
-		'ApiQueryUserInfo' => 'includes/api/query/ApiQueryUserInfo.php',
-		'ApiQueryWatchlist' => 'includes/api/query/ApiQueryWatchlist.php',
-
-		# API edit functions
-		'ApiBlock' => 'includes/api/edit/ApiBlock.php',
-		'ApiChangeRights' => 'includes/api/edit/ApiChangeRights.php',
-		'ApiDelete' => 'includes/api/edit/ApiDelete.php',
-		'ApiMove' => 'includes/api/edit/ApiMove.php',
-		'ApiProtect' => 'includes/api/edit/ApiProtect.php',
-		'ApiRollback' => 'includes/api/edit/ApiRollback.php',
-		'ApiUnblock' => 'includes/api/edit/ApiUnblock.php',
-		'ApiUndelete' => 'includes/api/edit/ApiUndelete.php'
+		# apiedit branch
+		'ApiBlock' => 'includes/api/ApiBlock.php',
+		'ApiChangeRights' => 'includes/api/ApiChangeRights.php',
+		'ApiDelete' => 'includes/api/ApiDelete.php',
+		'ApiMove' => 'includes/api/ApiMove.php',
+		'ApiProtect' => 'includes/api/ApiProtect.php',
+		'ApiQueryBlocks' => 'includes/api/ApiQueryBlocks.php',
+		'ApiQueryDeletedrevs' => 'includes/api/ApiQueryDeletedrevs.php',
+		'ApiRollback' => 'includes/api/ApiRollback.php',
+		'ApiUnblock' => 'includes/api/ApiUnblock.php',
+		'ApiUndelete' => 'includes/api/ApiUndelete.php'
 	);
 	
 	wfProfileIn( __METHOD__ );
diff --git a/includes/api/edit/ApiBlock.php b/includes/api/ApiBlock.php
index 2779204ef2de..ef9ad6cc2296 100644
--- a/includes/api/edit/ApiBlock.php
+++ b/includes/api/ApiBlock.php
@@ -159,6 +159,6 @@ class ApiBlock extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiBlock.php 28209 2007-12-06 16:06:22Z vasilievvv $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/edit/ApiChangeRights.php b/includes/api/ApiChangeRights.php
index bf19e93697cb..4991437a58ac 100644
--- a/includes/api/edit/ApiChangeRights.php
+++ b/includes/api/ApiChangeRights.php
@@ -165,6 +165,6 @@ class ApiChangeRights extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiChangeRights.php 28209 2007-12-06 16:06:22Z vasilievvv $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/edit/ApiDelete.php b/includes/api/ApiDelete.php
index b094d1a188db..6ca9f953ea2a 100644
--- a/includes/api/edit/ApiDelete.php
+++ b/includes/api/ApiDelete.php
@@ -167,6 +167,6 @@ class ApiDelete extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiDelete.php 28209 2007-12-06 16:06:22Z vasilievvv $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/edit/ApiMove.php b/includes/api/ApiMove.php
index 5cd5dd96fafc..2fc8fb106d26 100644
--- a/includes/api/edit/ApiMove.php
+++ b/includes/api/ApiMove.php
@@ -176,6 +176,6 @@ class ApiMove extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiMove.php 28209 2007-12-06 16:06:22Z vasilievvv $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/edit/ApiProtect.php b/includes/api/ApiProtect.php
index aa40b937fa35..91fa57d55e94 100644
--- a/includes/api/edit/ApiProtect.php
+++ b/includes/api/ApiProtect.php
@@ -137,6 +137,6 @@ class ApiProtect extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiProtect.php 28209 2007-12-06 16:06:22Z vasilievvv $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/query/ApiQuery.php b/includes/api/ApiQuery.php
index 8f5d0e1b9836..40485adf1c48 100644
--- a/includes/api/query/ApiQuery.php
+++ b/includes/api/ApiQuery.php
@@ -493,7 +493,7 @@ class ApiQuery extends ApiBase {
 	public function getVersion() {
 		$psModule = new ApiPageSet($this);
 		$vers = array ();
-		$vers[] = __CLASS__ . ': $Id: ApiQuery.php 28051 2007-12-02 14:24:07Z catrope $';
+		$vers[] = __CLASS__ . ': $Id$';
 		$vers[] = $psModule->getVersion();
 		return $vers;
 	}
diff --git a/includes/api/query/ApiQueryAllLinks.php b/includes/api/ApiQueryAllLinks.php
index 17f24b6549e8..a0c8766e9aeb 100644
--- a/includes/api/query/ApiQueryAllLinks.php
+++ b/includes/api/ApiQueryAllLinks.php
@@ -174,6 +174,6 @@ class ApiQueryAllLinks extends ApiQueryGeneratorBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryAllLinks.php 24453 2007-07-30 08:09:15Z yurik $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/query/ApiQueryAllUsers.php b/includes/api/ApiQueryAllUsers.php
index d853d466936c..7d554919d077 100644
--- a/includes/api/query/ApiQueryAllUsers.php
+++ b/includes/api/ApiQueryAllUsers.php
@@ -206,6 +206,6 @@ class ApiQueryAllUsers extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryAllUsers.php 26953 2007-10-26 03:48:58Z amidaniel $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/query/ApiQueryAllmessages.php b/includes/api/ApiQueryAllmessages.php
index adfe5656e2d8..9fe74e662bdb 100644
--- a/includes/api/query/ApiQueryAllmessages.php
+++ b/includes/api/ApiQueryAllmessages.php
@@ -115,6 +115,6 @@ class ApiQueryAllmessages extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryAllmessages.php 28027 2007-12-01 17:04:13Z vasilievvv $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/query/ApiQueryAllpages.php b/includes/api/ApiQueryAllpages.php
index 1af3d2a7223f..8f7daecc24d7 100644
--- a/includes/api/query/ApiQueryAllpages.php
+++ b/includes/api/ApiQueryAllpages.php
@@ -228,7 +228,7 @@ class ApiQueryAllpages extends ApiQueryGeneratorBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryAllpages.php 26725 2007-10-15 13:50:43Z catrope $';
+		return __CLASS__ . ': $Id$';
 	}
 }
 
diff --git a/includes/api/query/ApiQueryBacklinks.php b/includes/api/ApiQueryBacklinks.php
index ba6dccfefe87..bdd72acb6b92 100644
--- a/includes/api/query/ApiQueryBacklinks.php
+++ b/includes/api/ApiQueryBacklinks.php
@@ -387,7 +387,7 @@ class ApiQueryBacklinks extends ApiQueryGeneratorBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryBacklinks.php 27562 2007-11-16 22:50:59Z brion $';
+		return __CLASS__ . ': $Id$';
 	}
 }
 
diff --git a/includes/api/query/ApiQueryBase.php b/includes/api/ApiQueryBase.php
index 28adb41554ba..69492dbe979d 100644
--- a/includes/api/query/ApiQueryBase.php
+++ b/includes/api/ApiQueryBase.php
@@ -226,7 +226,7 @@ abstract class ApiQueryBase extends ApiBase {
 	}
 	
 	public static function getBaseVersion() {
-		return __CLASS__ . ': $Id: ApiQueryBase.php 24533 2007-08-01 22:46:22Z yurik $';
+		return __CLASS__ . ': $Id$';
 	}
 }
 
diff --git a/includes/api/query/ApiQueryBlocks.php b/includes/api/ApiQueryBlocks.php
index a1d32dc89444..8f5536888acc 100644
--- a/includes/api/query/ApiQueryBlocks.php
+++ b/includes/api/ApiQueryBlocks.php
@@ -236,6 +236,6 @@ class ApiQueryBlocks extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryBlocks.php 28209 2007-12-06 16:06:22Z vasilievvv $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/query/ApiQueryCategories.php b/includes/api/ApiQueryCategories.php
index 42bc1c384759..2283a8b9786e 100644
--- a/includes/api/query/ApiQueryCategories.php
+++ b/includes/api/ApiQueryCategories.php
@@ -151,7 +151,7 @@ class ApiQueryCategories extends ApiQueryGeneratorBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryCategories.php 24092 2007-07-14 19:04:31Z yurik $';
+		return __CLASS__ . ': $Id$';
 	}
 }
 
diff --git a/includes/api/query/ApiQueryCategoryMembers.php b/includes/api/ApiQueryCategoryMembers.php
index 2f09d96ef91b..487fea8b16b9 100644
--- a/includes/api/query/ApiQueryCategoryMembers.php
+++ b/includes/api/ApiQueryCategoryMembers.php
@@ -240,7 +240,7 @@ class ApiQueryCategoryMembers extends ApiQueryGeneratorBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryCategoryMembers.php 25726 2007-09-10 14:17:33Z catrope $';
+		return __CLASS__ . ': $Id$';
 	}
 }
 
diff --git a/includes/api/query/ApiQueryDeletedrevs.php b/includes/api/ApiQueryDeletedrevs.php
index ce5a7758a126..57e7fc0ad880 100644
--- a/includes/api/query/ApiQueryDeletedrevs.php
+++ b/includes/api/ApiQueryDeletedrevs.php
@@ -225,6 +225,6 @@ class ApiQueryDeletedrevs extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryDeletedrevs.php 28209 2007-12-06 16:06:22Z vasilievvv $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/query/ApiQueryExtLinksUsage.php b/includes/api/ApiQueryExtLinksUsage.php
index 385ae65b901b..2e47a5750c17 100644
--- a/includes/api/query/ApiQueryExtLinksUsage.php
+++ b/includes/api/ApiQueryExtLinksUsage.php
@@ -195,6 +195,6 @@ class ApiQueryExtLinksUsage extends ApiQueryGeneratorBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryExtLinksUsage.php 24694 2007-08-09 08:41:58Z yurik $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/query/ApiQueryExternalLinks.php b/includes/api/ApiQueryExternalLinks.php
index 440b31d6f05c..ad4634e14b91 100644
--- a/includes/api/query/ApiQueryExternalLinks.php
+++ b/includes/api/ApiQueryExternalLinks.php
@@ -87,7 +87,7 @@ class ApiQueryExternalLinks extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryExternalLinks.php 23819 2007-07-07 03:05:09Z yurik $';
+		return __CLASS__ . ': $Id$';
 	}
 }
 
diff --git a/includes/api/query/ApiQueryImageInfo.php b/includes/api/ApiQueryImageInfo.php
index 5b3002ba93f1..9d1026387c49 100644
--- a/includes/api/query/ApiQueryImageInfo.php
+++ b/includes/api/ApiQueryImageInfo.php
@@ -159,6 +159,6 @@ class ApiQueryImageInfo extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryImageInfo.php 26855 2007-10-20 18:27:39Z catrope $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/query/ApiQueryImages.php b/includes/api/ApiQueryImages.php
index d64a653b40db..10a5885834cd 100644
--- a/includes/api/query/ApiQueryImages.php
+++ b/includes/api/ApiQueryImages.php
@@ -112,7 +112,7 @@ class ApiQueryImages extends ApiQueryGeneratorBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryImages.php 24092 2007-07-14 19:04:31Z yurik $';
+		return __CLASS__ . ': $Id$';
 	}
 }
 
diff --git a/includes/api/query/ApiQueryInfo.php b/includes/api/ApiQueryInfo.php
index 8f9fc02c07d5..39a6c80ea406 100644
--- a/includes/api/query/ApiQueryInfo.php
+++ b/includes/api/ApiQueryInfo.php
@@ -220,7 +220,7 @@ class ApiQueryInfo extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryInfo.php 27877 2007-11-27 10:22:14Z rotem $';
+		return __CLASS__ . ': $Id$';
 	}
 }
 
diff --git a/includes/api/query/ApiQueryLangLinks.php b/includes/api/ApiQueryLangLinks.php
index ae5ff7906458..99457aee9c90 100644
--- a/includes/api/query/ApiQueryLangLinks.php
+++ b/includes/api/ApiQueryLangLinks.php
@@ -88,7 +88,7 @@ class ApiQueryLangLinks extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryLangLinks.php 23819 2007-07-07 03:05:09Z yurik $';
+		return __CLASS__ . ': $Id$';
 	}
 }
 
diff --git a/includes/api/query/ApiQueryLinks.php b/includes/api/ApiQueryLinks.php
index 7ec20f442b23..e3a402769ba2 100644
--- a/includes/api/query/ApiQueryLinks.php
+++ b/includes/api/ApiQueryLinks.php
@@ -156,7 +156,7 @@ class ApiQueryLinks extends ApiQueryGeneratorBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryLinks.php 24092 2007-07-14 19:04:31Z yurik $';
+		return __CLASS__ . ': $Id$';
 	}
 }
 
diff --git a/includes/api/query/ApiQueryLogEvents.php b/includes/api/ApiQueryLogEvents.php
index 0f143658bde1..87eaeb224965 100644
--- a/includes/api/query/ApiQueryLogEvents.php
+++ b/includes/api/ApiQueryLogEvents.php
@@ -266,7 +266,7 @@ class ApiQueryLogEvents extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryLogEvents.php 24256 2007-07-18 21:47:09Z robchurch $';
+		return __CLASS__ . ': $Id$';
 	}
 }
 
diff --git a/includes/api/query/ApiQueryRecentChanges.php b/includes/api/ApiQueryRecentChanges.php
index a7072ea29208..a80b6c771807 100644
--- a/includes/api/query/ApiQueryRecentChanges.php
+++ b/includes/api/ApiQueryRecentChanges.php
@@ -348,7 +348,7 @@ class ApiQueryRecentChanges extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryRecentChanges.php 26633 2007-10-12 14:03:43Z catrope $';
+		return __CLASS__ . ': $Id$';
 	}
 }
 
diff --git a/includes/api/query/ApiQueryRevisions.php b/includes/api/ApiQueryRevisions.php
index 52edf99f7e54..d5a108d4c810 100644
--- a/includes/api/query/ApiQueryRevisions.php
+++ b/includes/api/ApiQueryRevisions.php
@@ -377,7 +377,7 @@ class ApiQueryRevisions extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryRevisions.php 28176 2007-12-05 06:32:17Z amidaniel $';
+		return __CLASS__ . ': $Id$';
 	}
 }
 
diff --git a/includes/api/query/ApiQuerySearch.php b/includes/api/ApiQuerySearch.php
index 268616b16434..0352a55d1824 100644
--- a/includes/api/query/ApiQuerySearch.php
+++ b/includes/api/ApiQuerySearch.php
@@ -145,7 +145,7 @@ class ApiQuerySearch extends ApiQueryGeneratorBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQuerySearch.php 24453 2007-07-30 08:09:15Z yurik $';
+		return __CLASS__ . ': $Id$';
 	}
 }
 
diff --git a/includes/api/query/ApiQuerySiteinfo.php b/includes/api/ApiQuerySiteinfo.php
index 576ea98eaa40..1bd34cd453b1 100644
--- a/includes/api/query/ApiQuerySiteinfo.php
+++ b/includes/api/ApiQuerySiteinfo.php
@@ -233,6 +233,6 @@ class ApiQuerySiteinfo extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQuerySiteinfo.php 26444 2007-10-06 02:30:00Z amidaniel $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/query/ApiQueryUserContributions.php b/includes/api/ApiQueryUserContributions.php
index 05c3d9459921..6c3d356c8cad 100644
--- a/includes/api/query/ApiQueryUserContributions.php
+++ b/includes/api/ApiQueryUserContributions.php
@@ -270,7 +270,7 @@ class ApiQueryContributions extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryUserContributions.php 24754 2007-08-13 18:18:18Z robchurch $';
+		return __CLASS__ . ': $Id$';
 	}
 }
 
diff --git a/includes/api/query/ApiQueryUserInfo.php b/includes/api/ApiQueryUserInfo.php
index 978c67d235ba..b653c47411da 100644
--- a/includes/api/query/ApiQueryUserInfo.php
+++ b/includes/api/ApiQueryUserInfo.php
@@ -119,7 +119,7 @@ class ApiQueryUserInfo extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryUserInfo.php 27153 2007-11-03 16:08:43Z catrope $';
+		return __CLASS__ . ': $Id$';
 	}
 }
 
diff --git a/includes/api/query/ApiQueryWatchlist.php b/includes/api/ApiQueryWatchlist.php
index 16586a4005e3..e5f2d03e7326 100644
--- a/includes/api/query/ApiQueryWatchlist.php
+++ b/includes/api/ApiQueryWatchlist.php
@@ -293,7 +293,7 @@ class ApiQueryWatchlist extends ApiQueryGeneratorBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryWatchlist.php 24092 2007-07-14 19:04:31Z yurik $';
+		return __CLASS__ . ': $Id$';
 	}
 }
 
diff --git a/includes/api/edit/ApiRollback.php b/includes/api/ApiRollback.php
index 10999ff757dc..1c7606eced98 100644
--- a/includes/api/edit/ApiRollback.php
+++ b/includes/api/ApiRollback.php
@@ -151,6 +151,6 @@ class ApiRollback extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiRollback.php 28209 2007-12-06 16:06:22Z vasilievvv $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/edit/ApiUnblock.php b/includes/api/ApiUnblock.php
index c003699ec5d4..bf5f256097c3 100644
--- a/includes/api/edit/ApiUnblock.php
+++ b/includes/api/ApiUnblock.php
@@ -125,6 +125,6 @@ class ApiUnblock extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiUnblock.php 28209 2007-12-06 16:06:22Z vasilievvv $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/edit/ApiUndelete.php b/includes/api/ApiUndelete.php
index db569340c2e7..56ce3c6668ae 100644
--- a/includes/api/edit/ApiUndelete.php
+++ b/includes/api/ApiUndelete.php
@@ -124,6 +124,6 @@ class ApiUndelete extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiUndelete.php 28209 2007-12-06 16:06:22Z vasilievvv $';
+		return __CLASS__ . ': $Id$';
 	}
 }