force_frontend_fallback chaining

References #148
s9y · Nov 19, 2014 · d15c4c8 · d15c4c8 · onli · Nov 21, 2014
1 parent cf500ab
commit d15c4c8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/include/functions_config.inc.php b/include/functions_config.inc.php
@@ -254,16 +254,30 @@ function serendipity_set_user_var($name, $val, $authorid, $copy_to_s9y = true) {
  * @access public
  * @param   string      The filename to search for in the selected template
  * @param   string      The path selector that tells whether to return a HTTP or realpath
+ * @param   bool        Enable to include frontend template fallback chaining (used for wysiwyg Editor custom config files)
  * @return  string      The full path+filename to the requested file
  */
-function serendipity_getTemplateFile($file, $key = 'serendipityHTTPPath') {
+function serendipity_getTemplateFile($file, $key = 'serendipityHTTPPath', $force_frontend_fallback = false) {
     global $serendipity;
 
     $directories = array();
 
     if (defined('IN_serendipity_admin') && $serendipity['smarty_preview'] == false) {
         // Backend will always use our default backend (=defaultTemplate) as fallback.
         $directories[] = isset($serendipity['template_backend']) ? $serendipity['template_backend'] . '/' : '';
+
+        if ($force_frontend_fallback) {
+            // If enabled, even when within the admin suite it will be possible to reference files that
+            // reside within a template directory.
+            $directories[] = $serendipity['template'] . '/';
+            if (isset($serendipity['template_engine']) && $serendipity['template_engine'] != null) {
+                $p = explode(',', $serendipity['template_engine']);
+                foreach($p AS $te) {
+                    $directories[] = trim($te) . '/';
+                }
+            }
+        }
+
         $directories[] = $serendipity['defaultTemplate'] .'/';
         $directories[] = 'default/';
     } else {

diff --git a/include/functions_smarty.inc.php b/include/functions_smarty.inc.php
@@ -1035,11 +1035,11 @@ function serendipity_smarty_init($vars = array()) {
                 $force_internal_toolbar = true;
             }
             // check ckeditor custom plugin file
-            $ccp = serendipity_getTemplateFile('admin/ckeditor_custom_plugin.js');
+            $ccp = serendipity_getTemplateFile('admin/ckeditor_custom_plugin.js', 'serendipityHTTPPath', true);
             $wysiwyg_customPlugin = (!empty($ccp) && !$force_internal_toolbar) ? $ccp : $serendipity['serendipityHTTPPath'] . 'htmlarea/ckeditor_s9y_plugin.js';
 
             // check ckeditor custom config file
-            $ccc = serendipity_getTemplateFile('admin/ckeditor_custom_config.js');
+            $ccc = serendipity_getTemplateFile('admin/ckeditor_custom_config.js', 'serendipityHTTPPath', true);
             $wysiwyg_customConfig = (!empty($ccc) && !$force_internal_toolbar) ? $ccc : $serendipity['serendipityHTTPPath'] . 'htmlarea/ckeditor_s9y_config.js';
 
         }