Index: trunk/kernel/include/parseditem.php
===================================================================
diff -u -r842 -r845
--- trunk/kernel/include/parseditem.php (.../parseditem.php) (revision 842)
+++ trunk/kernel/include/parseditem.php (.../parseditem.php) (revision 845)
@@ -78,15 +78,22 @@
$field = strtolower($element->attributes["_field"]);
switch($field)
{
- case "id":
+ case 'primarycategory':
+ $db =& GetADODBConnection();
+ $sql = 'SELECT CachedNavbar FROM '.$objCatList->SourceTable.' WHERE CategoryId = '.(int)$this->GetPrimaryCategory();
+ $ret = prompt_language($objConfig->Get("Root_Name"));
+ if( $this->GetPrimaryCategory() ) $ret .= '>'.$db->GetOne($sql);
+ break;
+
+ case "id":
$ret = $this->Get($this->id_field);
break;
case "resourceid":
if(!$this->NoResourceId)
$ret = $this->Get("ResourceId");
break;
case "category":
- $c = $objCatList->GetItem($this->Get("CategoryId"));
+ $c = $objCatList->GetItem($this->Get("CategoryId"));
if(is_object($c))
{
$ret = $c->parsetag($element->attributes["_cattag"]);
@@ -440,10 +447,10 @@
else
{
$output = $this->ParseObject($tag);
- //echo $output."
";
+ //echo $output."
";
if(substr($output,0,9)=="Undefined")
{
- $output = $tag->Execute();
+ $output = $tag->Execute();
// if(substr($output,0,8)="{Unknown")
// $output = $raw;
} return $output;
Index: trunk/kernel/parser.php
===================================================================
diff -u -r827 -r845
--- trunk/kernel/parser.php (.../parser.php) (revision 827)
+++ trunk/kernel/parser.php (.../parser.php) (revision 845)
@@ -1282,7 +1282,7 @@
$LangId = (int)$ForceLanguage;
if(strlen($phrase))
{
- $lang = $attribs["_language"];
+ $lang = getArrayValue($attribs,'_language');
if(strlen($lang))
{
$l = $objLanguages->GetItemByField("PackName",$lang);
Index: trunk/kernel/include/parse.php
===================================================================
diff -u -r817 -r845
--- trunk/kernel/include/parse.php (.../parse.php) (revision 817)
+++ trunk/kernel/include/parse.php (.../parse.php) (revision 845)
@@ -258,12 +258,6 @@
{
if(function_exists($func))
{
- if( IsDebugMode() && !$GLOBALS['FrontEnd'] )
- {
- global $debugger;
- $debugger->dumpVars($this->name, $this->attributes);
- $debugger->appendTrace();
- }
$ret = @$func($this->attributes);
}
else
Index: trunk/kernel/include/category.php
===================================================================
diff -u -r817 -r845
--- trunk/kernel/include/category.php (.../category.php) (revision 817)
+++ trunk/kernel/include/category.php (.../category.php) (revision 845)
@@ -735,7 +735,11 @@
$field = strtolower( $element->GetAttributeByName('_field') );
switch($field)
{
- case "name":
+ case 'primarycategory':
+ $ret = prompt_language($objConfig->Get("Root_Name")).'>'.$this->Get('CachedNavbar');
+ break;
+
+ case "name":
case "Name":
/*
@field:cat.name