r84190 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r84189‎ | r84190 | r84191 >
Date:18:34, 17 March 2011
Author:tomasz
Status:ok
Tags:
Comment:
Syncing up to head of trunk from 84186
Modified paths:
  • /branches/wmf/1.17wmf1/extensions/WikimediaMobile (modified) (history)
  • /branches/wmf/1.17wmf1/extensions/WikimediaMobile/WikimediaMobile.php (modified) (history)

Diff [purge]

Index: branches/wmf/1.17wmf1/extensions/WikimediaMobile/WikimediaMobile.php
@@ -8,7 +8,7 @@
99 $wgExtensionCredits['other'][] = array(
1010 'path' => __FILE__,
1111 'name' => 'WikimediaMobile',
12 - 'author' => 'Tim Starling',
 12+ 'author' => array( 'Tim Starling', 'Brion Vibber', 'Hampton Catlin' ),
1313 'url' => 'http://www.mediawiki.org/wiki/Extension:WikimediaMobile',
1414 'descriptionmsg' => 'wikimediamobile-desc',
1515 );
@@ -33,9 +33,7 @@
3434 function wfWikimediaMobileAddJs( &$outputPage, &$skin ) {
3535 global $wgOut, $wgExtensionAssetsPath, $wgWikimediaMobileVersion;
3636
37 - # Live hack to put mobile redirect script in <head> --catrope Mar 5, 2011
3837 $wgOut->addHeadItem( 'mobileredirect', Html::linkedScript(
39 - #$wgOut->addScript( Html::linkedScript(
4038 "$wgExtensionAssetsPath/WikimediaMobile/MobileRedirect.js?$wgWikimediaMobileVersion"
4139 ) );
4240 return true;
@@ -46,4 +44,3 @@
4745 $vars['wgWikimediaMobileUrl'] = $wgWikimediaMobileUrl;
4846 return true;
4947 }
50 -
Property changes on: branches/wmf/1.17wmf1/extensions/WikimediaMobile
___________________________________________________________________
Modified: svn:mergeinfo
5148 Merged /trunk/extensions/WikimediaMobile:r84187-84189

Status & tagging log