Merge branch 'master' of gitorious.org:owncloud/owncloud into jqueryui

diff --cc lib/base.php
index 943ab5f24dc788572b299b1d46f4bc5fa510453d,854b91b0c1d9876c116f0a20930cb7b806101235..e0f14b703dc81c2cffb90da7e99b7912a514bedf
--- 1/lib/base.php
--- 2/lib/base.php
+++ b/lib/base.php
@@@ -130,9 -166,19 +166,19 @@@ class OC
                ini_set('session.cookie_httponly','1;');
                session_start();
  
+               // if the formfactor is not yet autodetected do the autodetection now. For possible forfactors check the detectFormfactor documentation
+               if(!isset($_SESSION['formfactor'])){
+                       $_SESSION['formfactor']=OC::detectFormfactor();
+               }
+               // allow manual override via GET parameter
+               if(isset($_GET['formfactor'])){
+                       $_SESSION['formfactor']=$_GET['formfactor'];
+               }
+ 
+ 
                // Add the stuff we need always
                OC_Util::addScript( "jquery-1.6.4.min" );
 -              OC_Util::addScript( "jquery-ui-1.8.14.custom.min" );
 +              OC_Util::addScript( "jquery-ui-1.8.16.custom.min" );
                OC_Util::addScript( "jquery-showpassword" );
                OC_Util::addScript( "jquery.infieldlabel.min" );
                OC_Util::addScript( "jquery-tipsy" );