diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2013-04-22 11:45:09 -0700 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2013-04-22 20:46:13 +0200 |
| commit | 2314067e75a637eac46ee3d915bf4e77bf0dac98 (patch) | |
| tree | c6322c4863d667bfadf6589ccc9918180e48c56a | |
| parent | c7a17efc0135b073b8b9f09cfc14da6acbfa7bbb (diff) | |
| parent | e1c5b31d6544b5f7700888526f7e55b66e677498 (diff) | |
| download | nextcloud-server-2314067e75a637eac46ee3d915bf4e77bf0dac98.tar.gz nextcloud-server-2314067e75a637eac46ee3d915bf4e77bf0dac98.zip | |
Merge pull request #3019 from owncloud/fix-3004
Test if we want a 3rdparty style/script before checking the 3rdparty root
| -rw-r--r-- | lib/templatelayout.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/templatelayout.php b/lib/templatelayout.php index 73094232230..69bebac0503 100644 --- a/lib/templatelayout.php +++ b/lib/templatelayout.php @@ -111,7 +111,8 @@ class OC_TemplateLayout extends OC_Template { $files = array(); foreach($styles as $style) { // is it in 3rdparty? - if(self::appendIfExist($files, OC::$THIRDPARTYROOT, OC::$THIRDPARTYWEBROOT, $style.'.css')) { + if(strpos($style, '3rdparty') === 0 && + self::appendIfExist($files, OC::$THIRDPARTYROOT, OC::$THIRDPARTYWEBROOT, $style.'.css')) { // or in the owncloud root? }elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "$style$fext.css" )) { @@ -169,7 +170,8 @@ class OC_TemplateLayout extends OC_Template { $files = array(); foreach($scripts as $script) { // Is it in 3rd party? - if(self::appendIfExist($files, OC::$THIRDPARTYROOT, OC::$THIRDPARTYWEBROOT, $script.'.js')) { + if(strpos($script, '3rdparty') === 0 && + self::appendIfExist($files, OC::$THIRDPARTYROOT, OC::$THIRDPARTYWEBROOT, $script.'.js')) { // Is it in apps and overwritten by the theme? }elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$script$fext.js" )) { |