Merge branch 'master' into multi_app_dir

Conflicts:
	lib/app.php
	lib/base.php
	lib/minimizer/css.php
	lib/minimizer/js.php
	lib/template.php
	lib/util.php

diff --cc apps/bookmarks/templates/list.php
Simple merge

diff --cc apps/user_webfinger/webfinger.php
Simple merge

diff --cc core/templates/layout.user.php
Simple merge

diff --cc lib/app.php
index 1dcccee1da073758aeee75551681ca6e2c604866,c08e977b0320634c933e2d4339ae3b64f896bad0..1a2dc370d69149bde01530941cd273644900edf0
--- 1/lib/app.php
--- 2/lib/app.php
+++ b/lib/app.php
@@@ -588,8 -542,9 +589,9 @@@ class OC_App
                if(!self::isEnabled($appid)){
                        return;
                }
 -              if(file_exists(OC::$APPSROOT.'/apps/'.$appid.'/appinfo/update.php')){
 +              if(file_exists(self::getAppPath($appid).'/appinfo/update.php')){
+                       self::loadApp($appid);
 -                      include OC::$APPSROOT.'/apps/'.$appid.'/appinfo/update.php';
 +                      include self::getAppPath($appid).'/appinfo/update.php';
                }
  
                //set remote/public handelers

diff --cc lib/base.php
index a0f5e83dd47a0a1d99611a2265df0bffadddebb1,b6ca19568feeb61bc3b946418e4662464c719002..2f16f7dab4c95a4b0f277c1e329c99c18086ab3f
--- 1/lib/base.php
--- 2/lib/base.php
+++ b/lib/base.php
@@@ -282,17 -240,16 +241,17 @@@ class OC
        }
  
        public static function loadfile(){
 -              if(file_exists(OC::$APPSROOT . '/apps/' . OC::$REQUESTEDAPP . '/' . OC::$REQUESTEDFILE)){
 +              if(file_exists(OC_App::getAppPath(OC::$REQUESTEDAPP) . '/' . OC::$REQUESTEDFILE)){
                        if(substr(OC::$REQUESTEDFILE, -3) == 'css'){
 -                              $file = 'apps/' . OC::$REQUESTEDAPP . '/' . OC::$REQUESTEDFILE;
 +                              $file = OC_App::getAppWebPath(OC::$REQUESTEDAPP). '/' . OC::$REQUESTEDFILE;
                                $minimizer = new OC_Minimizer_CSS();
-                               $minimizer->output(array(array(OC_App::getAppPath(OC::$REQUESTEDAPP), OC_App::getAppWebPath(OC::$REQUESTEDAPP), OC::$REQUESTEDFILE)));
 -                              $minimizer->output(array(array(OC::$APPSROOT, OC::$APPSWEBROOT, $file)), $file);
++                              $minimizer->output(array(array(OC_App::getAppPath(OC::$REQUESTEDAPP), OC_App::getAppWebPath(OC::$REQUESTEDAPP), OC::$REQUESTEDFILE)),$file);
                                exit;
                        }elseif(substr(OC::$REQUESTEDFILE, -3) == 'php'){
 -                              require_once(OC::$APPSROOT . '/apps/' . OC::$REQUESTEDAPP . '/' . OC::$REQUESTEDFILE);
 +                              require_once(OC_App::getAppPath(OC::$REQUESTEDAPP). '/' . OC::$REQUESTEDFILE);
                        }
                }else{
 +                      die();
                        header('HTTP/1.0 404 Not Found');
                        exit;
                }

diff --cc lib/helper.php
Simple merge

diff --cc lib/l10n.php
Simple merge

diff --cc lib/minimizer/css.php
index c7e5d96e06b1749b9694cbfe31b8b651e7a08657,da502bfa9e8ce9a5fe81288f4f5f73b75bec98be..97099adbdf635746b396e378b3b05e610721ed0b
--- 1/lib/minimizer/css.php
--- 2/lib/minimizer/css.php
+++ b/lib/minimizer/css.php
@@@ -6,56 -6,9 +6,8 @@@ class OC_Minimizer_CSS extends OC_Minim
  {
        protected $contentType = 'text/css';
  
-       public function findFiles($styles) {
-               // Read the selected theme from the config file
-               $theme=OC_Config::getValue( "theme" );
- 
-               // Read the detected formfactor and use the right file name.
-               $fext = OC_Template::getFormFactorExtension();
-               foreach($styles as $style){
-                       // is it in 3rdparty?
-                       if($this->appendIfExist(OC::$THIRDPARTYROOT, OC::$THIRDPARTYWEBROOT, $style.'.css')) {
- 
-                       // or in the owncloud root?
-                       }elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "$style$fext.css" )) {
-                       }elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "$style.css" )) {
- 
-                       // or in core ?
-                       }elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "core/$style$fext.css" )) {
-                       }elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "core/$style.css" )) {
- 
-                       }else{
-                               $append = false;
-                               foreach( OC::$APPSROOTS as $apps_dir)
-                               {
-                                       if($this->appendIfExist($apps_dir['path'], $apps_dir['url'], "$style$fext.css", true)) { $append =true; break; }
-                                       elseif($this->appendIfExist($apps_dir['path'], $apps_dir['url'], "$style.css", true )) { $append =true; break; }
-                               }
-                               if(! $append) {
-                                       echo('css file not found: style:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
-                                       die();
-                               }
-                       }
-               }
-               // Add the theme css files. you can override the default values here
-               if(!empty($theme)) {
-                       foreach($styles as $style){
-                                    if($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$style$fext.css" )) {
-                               }elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$style.css" )) {
- 
-                               }elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$style$fext.css" )) {
-                               }elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$style.css" )) {
- 
-                               }elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/core/$style$fext.css" )) {
-                               }elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/core/$style.css" )) {
-                               }
-                       }
-               }
-               return $this->files;
-       }
- 
        public function minimizeFiles($files) {
                $css_out = '';
 -              $appswebroot = (string) OC::$APPSWEBROOT;
                $webroot = (string) OC::$WEBROOT;
                foreach($files as $file_info) {
                        $file = $file_info[0] . '/' . $file_info[2];

diff --cc lib/template.php
Simple merge

diff --cc remote.php
Simple merge