diff options
| author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2014-11-12 16:23:19 +0100 |
|---|---|---|
| committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2014-11-12 16:23:19 +0100 |
| commit | d5796bbaf9fdcd21ed7de6489972ef0993993ccf (patch) | |
| tree | ac40b8b9ec3c0f0ec67549a25636567a290f5892 /lib/private/templatelayout.php | |
| parent | 268906995d9f34f42c5f6e07f4c0b0722fb3820d (diff) | |
| parent | 952abdc51ae19e05cf428e911d55de92c6ecc52f (diff) | |
| download | nextcloud-server-d5796bbaf9fdcd21ed7de6489972ef0993993ccf.tar.gz nextcloud-server-d5796bbaf9fdcd21ed7de6489972ef0993993ccf.zip | |
Merge pull request #12128 from owncloud/drop-formfactor
Drop form_factor that is appended to JS, CSS and template filenames
Diffstat (limited to 'lib/private/templatelayout.php')
| -rw-r--r-- | lib/private/templatelayout.php | 10 |
1 files changed, 2 insertions, 8 deletions
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); |