http://www.mediawiki.org/wiki/Special:Code/MediaWiki/95794
Revision: 95794
Author: preilly
Date: 2011-08-30 17:20:09 +0000 (Tue, 30 Aug 2011)
Log Message:
-----------
use x-device header
Modified Paths:
--------------
trunk/extensions/MobileFrontend/DeviceDetection.php
trunk/extensions/MobileFrontend/MobileFrontend.php
Modified: trunk/extensions/MobileFrontend/DeviceDetection.php
===================================================================
--- trunk/extensions/MobileFrontend/DeviceDetection.php 2011-08-30 16:41:08 UTC
(rev 95793)
+++ trunk/extensions/MobileFrontend/DeviceDetection.php 2011-08-30 17:20:09 UTC
(rev 95794)
@@ -294,6 +294,9 @@
if ( preg_match( '/Android/', $userAgent ) ) {
$formatName = 'android';
+ if ( strpos( $userAgent, 'Opera Mini' ) !== false ) {
+ $formatName = 'operamini';
+ }
} elseif ( preg_match( '/iPhone.* Safari/', $userAgent ) ) {
if ( strpos( $userAgent, 'iPhone OS 2' ) !== false ) {
$formatName = 'iphone2';
Modified: trunk/extensions/MobileFrontend/MobileFrontend.php
===================================================================
--- trunk/extensions/MobileFrontend/MobileFrontend.php 2011-08-30 16:41:08 UTC
(rev 95793)
+++ trunk/extensions/MobileFrontend/MobileFrontend.php 2011-08-30 17:20:09 UTC
(rev 95794)
@@ -65,7 +65,7 @@
);
class ExtMobileFrontend {
- const VERSION = '0.5.49';
+ const VERSION = '0.5.50';
/**
* @var DOMDocument
@@ -292,10 +292,18 @@
self::$search = $wgRequest->getText( 'search' );
self::$callback = $wgRequest->getText( 'callback' );
self::$searchField = $wgRequest->getText( 'search', '' );
+
+ $xDevice = isset( $_SERVER['HTTP_X_DEVICE'] ) ?
$_SERVER['HTTP_X_DEVICE'] : '';
$acceptHeader = $_SERVER["HTTP_ACCEPT"];
$device = new DeviceDetection();
- $formatName = $device->formatName( $userAgent, $acceptHeader );
+
+ if ( !empty( $xDevice ) ) {
+ $formatName = $xDevice;
+ } else {
+ $formatName = $device->formatName( $userAgent,
$acceptHeader );
+ }
+
self::$device = $device->format( $formatName );
if ( self::$device['view_format'] === 'wml' ) {
@@ -366,8 +374,6 @@
// Determine
- $xDevice = isset( $_SERVER['HTTP_X_DEVICE'] ) ?
$_SERVER['HTTP_X_DEVICE'] : '';
-
if (self::$useFormat === 'mobile' ||
self::$useFormat === 'mobile-wap' ||
!empty( $xDevice ) ) {
@@ -529,7 +535,7 @@
Html::rawElement( 'a',
array( 'href' => '#section_' .
intval( $headings - 1 ),
'class' =>
'back_to_top' ),
- '↑' .
$backToTop ) .
+ '↑' .
$backToTop ) .
Html::closeElement( 'div' );
// generate the HTML we are going to inject
$buttons = Html::element( 'button',
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
