Ensures the system knows which 'framework' we are using, even on ajax…

…_action [#984 state:resolved]
exponentcms · Apr 12, 2013 · 60fdf04 · 60fdf04
1 parent 36a125d
commit 60fdf04
Show file tree

Hide file tree

Showing 6 changed files with 174 additions and 155 deletions.
diff --git a/framework/core/expFramework.php b/framework/core/expFramework.php
@@ -242,7 +242,7 @@
  */
 function renderAction(array $parms=array()) {
     global $user, $db;
-    
+
     //Get some info about the controller
 //    $baseControllerName = expModules::getControllerName($parms['controller']);
     $fullControllerName = expModules::getControllerClassName($parms['controller']);

diff --git a/framework/core/forms/basetemplate.php b/framework/core/forms/basetemplate.php
@@ -65,16 +65,19 @@ function __construct($item_type, $item_dir, $view = "Default") {
         $this->tpl->cache_id = md5($this->viewfile);
 
         // set up plugin search order based on framework
-        if (empty($head_config['framework'])) $head_config['framework'] = '';
-        if ($head_config['framework'] == 'bootstrap') {
+        $framework = expSession::get('framework');
+//        if (empty($head_config['framework'])) $head_config['framework'] = '';
+//        if ($head_config['framework'] == 'bootstrap') {
+        if ($framework == 'bootstrap') {
             $this->tpl->setPluginsDir(array(
                 BASE.'themes/'.DISPLAY_THEME.'/plugins',
                 BASE.'framework/plugins/bootstrap',
                 BASE.'framework/plugins/jquery',
                 BASE.'framework/plugins',
                 SMARTY_PATH.'plugins',
             ));
-        } elseif ($head_config['framework'] == 'jquery') {
+//        } elseif ($head_config['framework'] == 'jquery') {
+        } elseif ($framework == 'jquery') {
             $this->tpl->setPluginsDir(array(
                 BASE.'themes/'.DISPLAY_THEME.'/plugins',
                 BASE.'framework/plugins/jquery',

diff --git a/framework/core/forms/controllertemplate.php b/framework/core/forms/controllertemplate.php
@@ -46,16 +46,19 @@ function __construct($controller, $viewfile) {
         $this->tpl->cache_id = md5($this->viewfile);
 
         // set up plugin search order based on framework
-        if (empty($head_config['framework'])) $head_config['framework'] = '';
-        if ($head_config['framework'] == 'bootstrap') {
+        $framework = expSession::get('framework');
+//        if (empty($head_config['framework'])) $head_config['framework'] = '';
+//        if ($head_config['framework'] == 'bootstrap') {
+        if ($framework == 'bootstrap') {
             $this->tpl->setPluginsDir(array(
                 BASE.'themes/'.DISPLAY_THEME.'/plugins',
                 BASE.'framework/plugins/bootstrap',
                 BASE.'framework/plugins/jquery',
                 BASE.'framework/plugins',
                 SMARTY_PATH.'plugins',
             ));
-        } elseif ($head_config['framework'] == 'jquery') {
+//        } elseif ($head_config['framework'] == 'jquery') {
+        } elseif ($framework == 'jquery') {
             $this->tpl->setPluginsDir(array(
                 BASE.'themes/'.DISPLAY_THEME.'/plugins',
                 BASE.'framework/plugins/jquery',

diff --git a/framework/core/subsystems/expTheme.php b/framework/core/subsystems/expTheme.php
@@ -135,6 +135,7 @@ public static function headerInfo($config) {
         if ($head_config['framework'] == 'jquery' || $head_config['framework'] == 'bootstrap') array_unshift($auto_dirs,BASE.'framework/core/forms/controls/jquery');
         if ($head_config['framework'] == 'bootstrap') array_unshift($auto_dirs,BASE.'framework/core/forms/controls/bootstrap');
         array_unshift($auto_dirs,BASE.'themes/'.DISPLAY_THEME.'/controls');
+        if (!expSession::is_set('framework')) expSession::set('framework',$head_config['framework']);
 
 		$metainfo = self::pageMetaInfo();