r100058 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r100057‎ | r100058 | r100059 >
Date:17:50, 17 October 2011
Author:preilly
Status:ok
Tags:
Comment:
Modified paths:
  • /branches/wmf/1.18wmf1/extensions/MobileFrontend/MobileFrontend.php (modified) (history)
  • /branches/wmf/1.18wmf1/extensions/MobileFrontend/views/layout/_search_webkit.html.php (modified) (history)

Diff [purge]

Index: branches/wmf/1.18wmf1/extensions/MobileFrontend/MobileFrontend.php
@@ -248,7 +248,7 @@
249249 throw new HttpError( 500, $message );
250250 } else {
251251 $parsedUrl = wfParseUrl( $targetUrl );
252 - if ( stristr( $parsedUrl['host'], $wgMobileDomain ) === FALSE ) {
 252+ if ( stristr( $parsedUrl['host'], $wgMobileDomain ) === false ) {
253253 $hostParts = explode( '.', $parsedUrl['host'] );
254254 $parsedUrl['host'] = $hostParts[0] . $wgMobileDomain . $hostParts[1] . '.' . $hostParts[2];
255255 }
@@ -314,6 +314,10 @@
315315
316316 $skin = $wgUser->getSkin();
317317 $copyright = $skin->getCopyright();
 318+ if ( stristr( $copyright, '<li>' ) !== false ) {
 319+ $copyright = '<ul><li>' . $copyright . '</li></ul>';
 320+ }
 321+
318322 // Need to stash the results of the "wfMsg" call before the Output Buffering handler
319323 // because at this point the database connection is shut down, etc.
320324
Index: branches/wmf/1.18wmf1/extensions/MobileFrontend/views/layout/_search_webkit.html.php
@@ -24,8 +24,8 @@
2525 </form>
2626 </div>
2727 <div class='nav' id='nav'>
28 - <button onClick="javascript:location.href='{$mainPageUrl}';" type="submit" id="homeButton">{$homeButton}</button>
29 - <button onClick="javascript:location.href='{$randomPageUrl}';" type="submit" id="randomButton">{$randomButton}</button>
 28+ <button onclick="javascript:location.href='{$mainPageUrl}';" type="submit" id="homeButton">{$homeButton}</button>
 29+ <button onclick="javascript:location.href='{$randomPageUrl}';" type="submit" id="randomButton">{$randomButton}</button>
3030 </div>
3131 </div>
3232 EOD;

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r100056part of the fix for bug 31773 - mobile view has invalid html structurepreilly17:42, 17 October 2011
r100057part of the fix for bug 31773 - mobile view has invalid html structurepreilly17:48, 17 October 2011

Status & tagging log