Merge "Kill DeviceDetection"

diff --combined includes/AutoLoader.php
index 8e2447d,53a66ca..01105da
--- 1/includes/AutoLoader.php
--- 2/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@@ -71,8 -71,6 +71,6 @@@ $wgAutoloadLocalClasses = array
        'DeferredUpdates' => 'includes/DeferredUpdates.php',
        'DeprecatedGlobal' => 'includes/DeprecatedGlobal.php',
        'DerivativeRequest' => 'includes/WebRequest.php',
-       'DeviceDetection' => 'includes/mobile/DeviceDetection.php',
-       'DeviceProperties' => 'includes/mobile/DeviceDetection.php',
        'DiffHistoryBlob' => 'includes/HistoryBlob.php',
        'DoubleReplacer' => 'includes/StringUtils.php',
        'DummyLinker' => 'includes/Linker.php',
@@@ -138,8 -136,6 +136,6 @@@
        'HttpRequest' => 'includes/HttpFunctions.old.php',
        'ICacheHelper' => 'includes/CacheHelper.php',
        'IcuCollation' => 'includes/Collation.php',
-       'IDeviceProperties' => 'includes/mobile/DeviceDetection.php',
-       'IDeviceDetector' => 'includes/mobile/DeviceDetection.php',
        'IdentityCollation' => 'includes/Collation.php',
        'ImageGallery' => 'includes/ImageGallery.php',
        'ImageHistoryList' => 'includes/ImagePage.php',
@@@ -580,7 -576,6 +576,7 @@@
        'MoveFileOp' => 'includes/filebackend/FileOp.php',
        'DeleteFileOp' => 'includes/filebackend/FileOp.php',
        'CreateFileOp' => 'includes/filebackend/FileOp.php',
 +      'DescribeFileOp' => 'includes/filebackend/FileOp.php',
        'NullFileOp' => 'includes/filebackend/FileOp.php',
  
        # includes/filerepo

diff --combined includes/DefaultSettings.php
index 60c3ab8,7ac5c04..0901d8c
--- 1/includes/DefaultSettings.php
--- 2/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@@ -2535,6 -2535,11 +2535,6 @@@ $wgAllowRdfaAttributes = false
   */
  $wgAllowMicrodataAttributes = false;
  
 -/**
 - * Cleanup as much presentational html like valign -> css vertical-align as we can
 - */
 -$wgCleanupPresentationalAttributes = true;
 -
  /**
   * Should we try to make our HTML output well-formed XML?  If set to false,
   * output will be a few bytes shorter, and the HTML will arguably be more
@@@ -4586,9 -4591,7 +4586,9 @@@ $wgProfileOnly = false
   * Log sums from profiling into "profiling" table in db.
   *
   * You have to create a 'profiling' table in your database before using
 - * this feature, see maintenance/archives/patch-profiling.sql
 + * this feature.  Run set $wgProfileToDatabase to true in
 + * LocalSettings.php and run maintenance/update.php or otherwise
 + * manually add patch-profiling.sql to your database.
   *
   * To enable profiling, edit StartProfiler.php
   */
@@@ -6204,20 -6207,6 +6204,6 @@@ $wgCompiledFiles = array()
  
  /** @} */ # End of HipHop compilation }
  
- 
- /************************************************************************//**
-  * @name   Mobile support
-  * @{
-  */
- 
- /**
-  * Name of the class used for mobile device detection, must be inherited from
-  * IDeviceDetector.
-  */
- $wgDeviceDetectionClass = 'DeviceDetection';
- 
- /** @} */ # End of Mobile support }
- 
  /************************************************************************//**
   * @name   Miscellaneous
   * @{