Index: branches/unlabeled/unlabeled-1.68.4/core/kernel/db/db_tag_processor.php =================================================================== diff -u -r7432 -r7456 --- branches/unlabeled/unlabeled-1.68.4/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 7432) +++ branches/unlabeled/unlabeled-1.68.4/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 7456) @@ -841,31 +841,31 @@ case 'current': $ret = $object->Page; break; - + case 'total': $ret = $object->GetTotalPages(); break; - + case 'prev': $ret = $object->Page > 1 ? $object->Page - 1 : false; break; - + case 'next': $ret = $object->Page < $object->GetTotalPages() ? $object->Page + 1 : false; break; } - + if ($ret && isset($params['as_link']) && $params['as_link']) { unset($params['as_link']); // remove parameters used only by current tag $params['page'] = $ret; $current_page = $object->Page; // backup current page $ret = $this->PageLink($params); $this->Application->SetVar($object->getPrefixSpecial().'_Page', $current_page); // restore page } - + return $ret; } - + /** * Print grid pagination using * block names specified @@ -1361,7 +1361,7 @@ } function GridInfo($params) { - $object =& $this->getObject($params); + $object =& $this->GetList($params); /* @var $object kDBList */ switch ($params['type']) { @@ -1779,6 +1779,8 @@ $value = $this->Field($params); $name = $this->InputName($params); + $theme_path = $this->Application->BaseURL().substr($this->Application->GetFrontThemePath(), 1); + include_once(FULL_PATH.'/core/cmseditor/fckeditor.php'); $oFCKeditor = new FCKeditor($name); $oFCKeditor->BasePath = BASE_PATH.'/core/cmseditor/'; @@ -1791,7 +1793,9 @@ 'ProjectPath' => BASE_PATH.'/', 'CustomConfigurationsPath' => $this->Application->BaseURL().'core/admin_templates/js/inp_fckconfig.js', // 'EditorAreaCSS' => $this->Application->BaseURL().'/themes/inportal_site/inc/inportal.css', //GetThemeCSS(), - 'StylesXmlPath' => $this->Application->BaseURL().'core/admin_templates/js/inp_styles.xml', + 'StylesXmlPath' => $theme_path.'/inc/styles.xml', + 'EditorAreaCSS' => $theme_path.'/inc/style.css', + 'DefaultClass' => 'Default Text', // 'Debug' => 1, 'Admin' => 1, 'K4' => 1, @@ -1814,7 +1818,7 @@ function ItemLink($params) { $object =& $this->getObject($params); - + $params['pass'] = 'm'; $params[$object->getPrefixSpecial().'_id'] = $object->GetID();