r106340 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r106339‎ | r106340 | r106341 >
Date:17:27, 15 December 2011
Author:reedy
Status:ok
Tags:
Comment:
Followup r104261, don't apply fragment depending on whether there is a query string
Modified paths:
  • /trunk/extensions/MobileFrontend/MobileFrontend.php (modified) (history)

Diff [purge]

Index: trunk/extensions/MobileFrontend/MobileFrontend.php
@@ -393,9 +393,11 @@
394394
395395 $languageUrl = $parsedUrl['scheme'] . $parsedUrl['delimiter'] . $parsedUrl['host'] . $parsedUrl['path'];
396396 if ( isset( $parsedUrl['query'] ) ) {
397 - $languageUrl .= $queryDelimiter . $parsedUrl['query'] . $fragmentDelimiter . $parsedUrl['fragment'];
 397+ $languageUrl .= $queryDelimiter . $parsedUrl['query'];
398398 }
399 -
 399+ if ( isset( $parsedUrl['fragment'] ) ) {
 400+ $languageUrl .= $fragmentDelimiter . $parsedUrl['fragment'];
 401+ }
400402 $languageUrls[] = array(
401403 'href' => $languageUrl,
402404 'text' => ( $wgContLang->getLanguageName( $nt->getInterwiki() ) != ''
@@ -963,7 +965,7 @@
964966 );
965967 $disableTemplate->setByArray( $options );
966968 $disableHtml = $disableTemplate->getHTML();
967 -
 969+
968970 $contentHtml = $disableHtml;
969971 $noticeHtml = ( !empty( $noticeHtml ) ) ? $noticeHtml : '';
970972 $applicationTemplate = $this->getApplicationTemplate();
@@ -1333,7 +1335,7 @@
13341336 }
13351337
13361338 $ptAnonLogin = $this->doc->getElementById( 'pt-anonlogin' );
1337 -
 1339+
13381340 if ( !$ptAnonLogin ) {
13391341 $ptAnonLogin = $this->doc->getElementById( 'pt-login' );
13401342 }

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r104261Bug 32649 - Many undefined variables when making language links...reedy00:15, 26 November 2011

Status & tagging log