Index: branches/RC/core/units/admin/admin_tag_processor.php =================================================================== diff -u -r10749 -r10832 --- branches/RC/core/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 10749) +++ branches/RC/core/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 10832) @@ -479,7 +479,7 @@ } $oFCKeditor->Config = Array( -// 'UserFilesPath' => FULL_PATH.'/kernel/user_files', +// 'UserFilesPath' => (defined('WRITEABLE') ? WRITEABLE : FULL_PATH.'/kernel') . '/user_files/', 'ProjectPath' => BASE_PATH.'/', 'CustomConfigurationsPath' => $config_path, // 'EditorAreaCSS' => $this->Application->BaseURL().'/themes/inportal_site/inc/inportal.css', //GetThemeCSS(), @@ -602,12 +602,22 @@ return $timestamp; } + + /** + * Redirect to cache rebuild template, when required by installator + * + * @param Array $params + */ function CheckPermCache($params) { - if ($this->Conn->GetOne('SELECT Data FROM '.TABLE_PREFIX.'Cache WHERE VarName = \'ForcePermCacheUpdate\'')) { + $sql = 'SELECT Data + FROM '.TABLE_PREFIX.'Cache + WHERE VarName = "ForcePermCacheUpdate"'; + if ($this->Application->isModuleEnabled('In-Portal') && $this->Conn->GetOne($sql)) { $this->Application->Redirect($params['cache_update_t'], array('continue' => 1)); } } + /** * Checks if current protocol is SSL * @@ -807,8 +817,8 @@ $style = $this->Conn->GetRow('SELECT * FROM '.TABLE_PREFIX.'Skins WHERE IsPrimary = 1'); } - $css_path = (defined('WRITEABLE') ? WRITEABLE : FULL_PATH.'/kernel').'/user_files'; - $css_url = $this->Application->BaseURL(defined('WRITEBALE_BASE') ? WRITEBALE_BASE : '/kernel').'user_files/'; + $css_path = (defined('WRITEABLE') ? WRITEABLE : FULL_PATH.'/kernel') . '/user_files'; + $css_url = $this->Application->BaseURL(defined('WRITEBALE_BASE') ? WRITEBALE_BASE : '/kernel') . 'user_files/'; if (isset($params['type']) && $params['type'] == 'logo') { return $style['Logo'] ? $css_url.$style['Logo'] : '';