Index: trunk/kernel/include/usersession.php
===================================================================
diff -u -N -r988 -r1025
--- trunk/kernel/include/usersession.php (.../usersession.php) (revision 988)
+++ trunk/kernel/include/usersession.php (.../usersession.php) (revision 1025)
@@ -596,6 +596,7 @@
$this->CurrentUser->LoadPersistantVars();
}
$val = $this->CurrentUser->GetPersistantVariable($variableName);
+ //echo "Persistant Val for $variableName: $val
";
}
if(!strlen($val))
$val = $objConfig->Get($variableName);
Index: trunk/themes/default/sort_cats.tpl
===================================================================
diff -u -N -r943 -r1025
--- trunk/themes/default/sort_cats.tpl (.../sort_cats.tpl) (revision 943)
+++ trunk/themes/default/sort_cats.tpl (.../sort_cats.tpl) (revision 1025)
@@ -6,7 +6,7 @@
- ()
+
Index: trunk/kernel/include/parseditem.php
===================================================================
diff -u -N -r1019 -r1025
--- trunk/kernel/include/parseditem.php (.../parseditem.php) (revision 1019)
+++ trunk/kernel/include/parseditem.php (.../parseditem.php) (revision 1025)
@@ -1919,7 +1919,7 @@
{
$Orders[] = $TableName."Priority DESC";
}
-
+
if(count($this->Query_SortField)>0)
{
for($x = 0; $x < count($this->Query_SortField); $x++)
@@ -1930,6 +1930,7 @@
if(is_object($objSession))
{
$FieldVarData = $objSession->GetPersistantVariable($FieldVar);
+ //echo "FieldVar: $FieldVarData
";
if(strlen($FieldVarData)>0)
{
$Orders[] = trim($TableName.$objSession->GetPersistantVariable($FieldVar) . " ".
Index: trunk/kernel/parser.php
===================================================================
diff -u -N -r1020 -r1025
--- trunk/kernel/parser.php (.../parser.php) (revision 1020)
+++ trunk/kernel/parser.php (.../parser.php) (revision 1025)
@@ -2035,7 +2035,7 @@
$table = $Item->Get("SourceTable");
//$sql = "SELECT * FROM ".$objSearchConfig->SourceTable." WHERE TableName='$table' AND AdvancedSearch=1 ORDER BY DisplayOrder";
- $sql = "SELECT sc.* FROM ".$objSearchConfig->SourceTable." AS sc LEFT JOIN ".GetTablePrefix()."CustomField AS cf ON sc.CustomFieldId = cf.CustomFieldId WHERE TableName='$table' OR (TableName='".GetTablePrefix()."CustomField' AND cf.Type = $ItemType) AND AdvancedSearch=1 ORDER BY sc.DisplayOrder";
+ $sql = "SELECT sc.* FROM ".$objSearchConfig->SourceTable." AS sc LEFT JOIN ".GetTablePrefix()."CustomField AS cf ON sc.CustomFieldId = cf.CustomFieldId WHERE (TableName='$table' OR (TableName='".GetTablePrefix()."CustomField' AND cf.Type = $ItemType)) AND AdvancedSearch=1 ORDER BY sc.DisplayOrder";
$objSearchConfig->Query_Item($sql);
$row=0;
if(is_array($objSearchConfig->Items))
Index: trunk/kernel/include/searchitems.php
===================================================================
diff -u -N -r1019 -r1025
--- trunk/kernel/include/searchitems.php (.../searchitems.php) (revision 1019)
+++ trunk/kernel/include/searchitems.php (.../searchitems.php) (revision 1025)
@@ -518,20 +518,20 @@
//echo $SelectSQL."
\n";
- if($InitTable = TRUE)
+ if($InitTable == TRUE)
{
$this->adodbConnection->Execute("DROP TABLE IF EXISTS ".$this->ResultTable);
//$indexSQL = "(INDEX(Relevance), INDEX(ItemId), INDEX(ItemType), INDEX sorting (EdPick,Relevance)) ";
$full_sql = "CREATE TABLE ".$this->ResultTable." ".$indexSQL.$SelectSQL;
- //echo $full_sql."
\n";
+ //echo "Full SQL:".$full_sql."
\n";
$this->adodbConnection->Execute($full_sql);
//echo $this->adodbConnection->ErrorMsg()."
\n";
$objSession->SetVariable("Search_Keywords",$this->Phrase);
}
else
{
$full_sql = "INSERT INTO ".$this->ResultTable." (Relevance,ItemId,ResourceId,ItemType,EdPick) ".$SelectSQL;
- //echo "[".htmlspecialchars($full_sql)."]
\n";
+ //echo "[".htmlspecialchars($full_sql)."]
\n";
$this->adodbConnection->Execute($full_sql);
//echo $this->adodbConnection->ErrorMsg()."
\n";
}