From 952abdc51ae19e05cf428e911d55de92c6ecc52f Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Wed, 12 Nov 2014 12:37:50 +0100 Subject: Drop form_factor that is appended to JS, CSS and template filenames --- lib/private/templatelayout.php | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'lib/private/templatelayout.php') diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php index a93449f202f..a066f90bb23 100644 --- a/lib/private/templatelayout.php +++ b/lib/private/templatelayout.php @@ -131,10 +131,7 @@ class OC_TemplateLayout extends OC_Template { // Read the selected theme from the config file $theme = OC_Util::getTheme(); - // Read the detected form factor and use the right file name. - $formFactorExt = self::getFormFactorExtension(); - - $locator = new \OC\Template\CSSResourceLocator( $theme, $formFactorExt, + $locator = new \OC\Template\CSSResourceLocator( $theme, array( OC::$SERVERROOT => OC::$WEBROOT ), array( OC::$THIRDPARTYROOT => OC::$THIRDPARTYWEBROOT )); $locator->find($styles); @@ -149,10 +146,7 @@ class OC_TemplateLayout extends OC_Template { // Read the selected theme from the config file $theme = OC_Util::getTheme(); - // Read the detected form factor and use the right file name. - $formFactorExt = self::getFormFactorExtension(); - - $locator = new \OC\Template\JSResourceLocator( $theme, $formFactorExt, + $locator = new \OC\Template\JSResourceLocator( $theme, array( OC::$SERVERROOT => OC::$WEBROOT ), array( OC::$THIRDPARTYROOT => OC::$THIRDPARTYWEBROOT )); $locator->find($scripts); -- cgit v1.2.3