r95603 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r95602‎ | r95603 | r95604 >
Date:18:28, 27 August 2011
Author:platonides
Status:reverted (Comments)
Tags:
Comment:
Unused variables.
$wgContLang in CategoryPage was probably removed with the better directionality improvements.
$wgServer, $wgRequest in getFullUrl() unused since r94375
Other variables added in r95396 iwtransclusion merge.
Modified paths:
  • /trunk/phase3/includes/CategoryPage.php (modified) (history)
  • /trunk/phase3/includes/Title.php (modified) (history)
  • /trunk/phase3/includes/cache/HTMLCacheUpdate.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/CategoryPage.php
@@ -143,7 +143,7 @@
144144 * @return string HTML output
145145 */
146146 public function getHTML() {
147 - global $wgOut, $wgCategoryMagicGallery, $wgContLang;
 147+ global $wgOut, $wgCategoryMagicGallery;
148148 wfProfileIn( __METHOD__ );
149149
150150 $this->showGallery = $wgCategoryMagicGallery && !$wgOut->mNoGallery;
Index: trunk/phase3/includes/cache/HTMLCacheUpdate.php
@@ -213,7 +213,7 @@
214214 * Invalidate an array of distant pages, given the wiki ID and page ID of those pages
215215 */
216216 protected function invalidateDistantTitles( $distantPageArray ) {
217 - global $wgUseFileCache, $wgUseSquid, $wgLocalInterwiki;
 217+ global $wgUseSquid;
218218
219219 $pagesByWiki = array();
220220 $titleArray = array();
Index: trunk/phase3/includes/Title.php
@@ -849,8 +849,6 @@
850850 * @return String the URL
851851 */
852852 public function getFullURL( $query = '', $variant = false ) {
853 - global $wgServer, $wgRequest;
854 -
855853 # Hand off all the decisions on urls to getLocalURL
856854 $url = $this->getLocalURL( $query, $variant );
857855
@@ -3162,7 +3160,7 @@
31633161 * @return Mixed true on success, getUserPermissionsErrors()-like array on failure
31643162 */
31653163 public function moveTo( &$nt, $auth = true, $reason = '', $createRedirect = true ) {
3166 - global $wgContLang, $wgEnableInterwikiTemplatesTracking, $wgGlobalDatabase;
 3164+ global $wgEnableInterwikiTemplatesTracking, $wgGlobalDatabase;
31673165
31683166 $err = $this->isValidMoveOperation( $nt, $auth, $reason );
31693167 if ( is_array( $err ) ) {
@@ -3323,7 +3321,7 @@
33243322 * if the user doesn't have the suppressredirect right
33253323 */
33263324 private function moveOverExistingRedirect( &$nt, $reason = '', $createRedirect = true ) {
3327 - global $wgUseSquid, $wgUser, $wgContLang, $wgEnableInterwikiTemplatesTracking, $wgGlobalDatabase;
 3325+ global $wgUser, $wgContLang, $wgEnableInterwikiTemplatesTracking, $wgGlobalDatabase;
33283326
33293327 $moveOverRedirect = $nt->exists();
33303328
@@ -4369,4 +4367,4 @@
43704368 wfRunHooks( 'PageContentLanguage', array( $this, &$pageLang, $wgLang ) );
43714369 return wfGetLangObj( $pageLang );
43724370 }
4373 -}
\ No newline at end of file
 4371+}

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r94375Touch up Title::get[Full|Local]URL. This concept of "if not an existing inter...dantman19:55, 12 August 2011
r95396Merge the iwtransclusion branch back into trunk...reedy13:03, 24 August 2011

Comments

#Comment by Platonides (talk | contribs)   21:12, 25 October 2011

There should be a mention (or follow-up) that it was reverted before the whole iwtransclusion merge was reverted.

Status & tagging log