Created
April 10, 2018 09:26
-
-
Save fixpunkt/2721318b45d88f3defa3c537db4e1be0 to your computer and use it in GitHub Desktop.
Revisions
-
fixpunkt created this gist
Apr 10, 2018 .There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode charactersOriginal file line number Diff line number Diff line change @@ -0,0 +1,85 @@ diff --git a/engine/Library/Enlight/Template/Plugins/function.flink.php b/engine/Library/Enlight/Template/Plugins/function.flink.php index 83fb90b3cc..084eed24ba 100644 --- a/engine/Library/Enlight/Template/Plugins/function.flink.php +++ b/engine/Library/Enlight/Template/Plugins/function.flink.php @@ -45,7 +45,7 @@ function smarty_function_flink($params, $template) // Try to find the file on the filesystem foreach ($templateDirs as $dir) { if (file_exists($dir . $file)) { - $file = Enlight_Loader::realpath($dir) . DIRECTORY_SEPARATOR . str_replace('/', DIRECTORY_SEPARATOR, $file); + $file = preg_replace('/\/+/', DIRECTORY_SEPARATOR, ($dir . DIRECTORY_SEPARATOR . $file)); break; } if ($useIncludePath) { diff --git a/engine/Library/Enlight/Template/Plugins/resource.parent.php b/engine/Library/Enlight/Template/Plugins/resource.parent.php index 4a12519715..b8627e603e 100644 --- a/engine/Library/Enlight/Template/Plugins/resource.parent.php +++ b/engine/Library/Enlight/Template/Plugins/resource.parent.php @@ -41,7 +41,7 @@ class Smarty_Resource_Parent extends Smarty_Internal_Resource_File $hit = false; foreach ($source->smarty->getTemplateDir() as $_directory) { - $_filePath = Enlight_Loader::realpath($_directory . $file); + $_filePath = $_directory . $file; if ($this->fileExists($source, $_filePath)) { if ($hit) { return $_filePath; diff --git a/themes/Backend/ExtJs/backend/base/header.tpl b/themes/Backend/ExtJs/backend/base/header.tpl index 6e2d18616e..a0c7803748 100644 --- a/themes/Backend/ExtJs/backend/base/header.tpl +++ b/themes/Backend/ExtJs/backend/base/header.tpl @@ -24,7 +24,7 @@ {/block} {block name="backend/base/header/javascript"} - <script type="text/javascript" src="{link file='ExtJs/ext-all.js'}?{$SHOPWARE_REVISION}"></script> + <script type="text/javascript" src="{link file='ExtJs/ext-all-debug.js'}?{$SHOPWARE_REVISION}"></script> <script type="text/javascript" src="{link file="ExtJs/locale/ext-lang-{s name=script/ext/lang}en_GB{/s}.js"}?{$SHOPWARE_REVISION}"></script> <script type="text/javascript" src="{link file='TinyMce/tiny_mce.js'}?{$SHOPWARE_REVISION}"></script> <script type="text/javascript" src="{link file='CodeMirror/lib/codemirror.js'}?{$SHOPWARE_REVISION}"></script> diff --git a/themes/Backend/ExtJs/backend/base/store/dispatch.js b/themes/Backend/ExtJs/backend/base/store/dispatch.js index 646f455543..bf32cc7e54 100644 --- a/themes/Backend/ExtJs/backend/base/store/dispatch.js +++ b/themes/Backend/ExtJs/backend/base/store/dispatch.js @@ -41,7 +41,7 @@ Ext.define('Shopware.apps.Base.store.Dispatch', { pageSize: 1000, remoteFilter: true, filters: [{ - property: 'active', + property: 'dispatches.active', value: true }], diff --git a/themes/Backend/ExtJs/backend/ext_js/index.tpl b/themes/Backend/ExtJs/backend/ext_js/index.tpl index 23fd79bc15..08ebce11b7 100644 --- a/themes/Backend/ExtJs/backend/ext_js/index.tpl +++ b/themes/Backend/ExtJs/backend/ext_js/index.tpl @@ -9,7 +9,7 @@ {/block} {block name="backend_index_javascript"} -<script type="text/javascript" src="{link file='ExtJs/ext-all.js'}" charset="utf-8"></script> +<script type="text/javascript" src="{link file='ExtJs/ext-all-debug.js'}" charset="utf-8"></script> <script type="text/javascript" src="{link file="ExtJs/locale/ext-lang-de.js"}" charset="utf-8"></script> <script type="text/javascript"> //<![CDATA[ @@ -49,4 +49,4 @@ Ext.Loader.getPath = function(className) { {block name="backend_index_javascript_inline"}{/block} //]]> </script> -{/block} \ No newline at end of file +{/block} diff --git a/themes/Backend/ExtJs/backend/index/controller/main.js b/themes/Backend/ExtJs/backend/index/controller/main.js index 02c88e47fe..f266a51ee7 100644 --- a/themes/Backend/ExtJs/backend/index/controller/main.js +++ b/themes/Backend/ExtJs/backend/index/controller/main.js @@ -258,7 +258,7 @@ Ext.define('Shopware.apps.Index.controller.Main', { } }, failure: function() { - window.location.href = '{url controller=index}'; + // window.location.href = '{url controller=index}'; } }); }