| Index: branches/liquidthreads/includes/api/ApiQuerySiteinfo.php |
| — | — | @@ -68,7 +68,7 @@ |
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | protected function appendGeneralInfo($property) { |
| 72 | | - global $wgSitename, $wgVersion, $wgCapitalLinks, $wgRightsCode, $wgRightsText, $wgLanguageCode; |
| | 72 | + global $wgSitename, $wgVersion, $wgCapitalLinks, $wgRightsCode, $wgRightsText, $wgLanguageCode, $IP; |
| 73 | 73 | |
| 74 | 74 | $data = array (); |
| 75 | 75 | $mainPage = Title :: newFromText(wfMsgForContent('mainpage')); |
| — | — | @@ -76,6 +76,10 @@ |
| 77 | 77 | $data['base'] = $mainPage->getFullUrl(); |
| 78 | 78 | $data['sitename'] = $wgSitename; |
| 79 | 79 | $data['generator'] = "MediaWiki $wgVersion"; |
| | 80 | + |
| | 81 | + $svn = SpecialVersion::getSvnRevision ( $IP ); |
| | 82 | + if ( $svn ) $data['rev'] = $svn; |
| | 83 | + |
| 80 | 84 | $data['case'] = $wgCapitalLinks ? 'first-letter' : 'case-sensitive'; // 'case-insensitive' option is reserved for future |
| 81 | 85 | if (isset($wgRightsCode)) |
| 82 | 86 | $data['rightscode'] = $wgRightsCode; |
| — | — | @@ -231,4 +235,4 @@ |
| 232 | 236 | public function getVersion() { |
| 233 | 237 | return __CLASS__ . ': $Id$'; |
| 234 | 238 | } |
| 235 | | -} |
| \ No newline at end of file |
| | 239 | +} |
| Index: branches/liquidthreads/includes/api/ApiQueryRevisions.php |
| — | — | @@ -278,8 +278,8 @@ |
| 279 | 279 | 'limit' => array ( |
| 280 | 280 | ApiBase :: PARAM_TYPE => 'limit', |
| 281 | 281 | ApiBase :: PARAM_MIN => 1, |
| 282 | | - ApiBase :: PARAM_MAX => ApiBase :: LIMIT_SML1, |
| 283 | | - ApiBase :: PARAM_MAX2 => ApiBase :: LIMIT_SML2 |
| | 282 | + ApiBase :: PARAM_MAX => ApiBase :: LIMIT_BIG1, |
| | 283 | + ApiBase :: PARAM_MAX2 => ApiBase :: LIMIT_BIG2 |
| 284 | 284 | ), |
| 285 | 285 | 'startid' => array ( |
| 286 | 286 | ApiBase :: PARAM_TYPE => 'integer' |
| Index: branches/liquidthreads/RELEASE-NOTES |
| — | — | @@ -105,6 +105,9 @@ |
| 106 | 106 | * (bug 11404) Provide name of exception caught in error code field of internal api |
| 107 | 107 | error messages. |
| 108 | 108 | * (bug 11534) rvendid doesn't work |
| | 109 | +* Fixed rvlimit of the revisions query to only enforce the lower query limit if |
| | 110 | + revision content is requested. |
| | 111 | +* Include svn revision number (if install is checked-out from svn) in siteinfo query. |
| 109 | 112 | |
| 110 | 113 | === Languages updated in 1.12 === |
| 111 | 114 | |
| Property changes on: branches/liquidthreads |
| ___________________________________________________________________ |
| Modified: svnmerge-integrated |
| 112 | 115 | - /trunk/phase3:1-26430 |
| 113 | 116 | + /trunk/phase3:1-26447 |