Index: trunk/admin/install.php =================================================================== diff -u -r118 -r120 --- trunk/admin/install.php (.../install.php) (revision 118) +++ trunk/admin/install.php (.../install.php) (revision 120) @@ -4,7 +4,6 @@ //$new_version = '1.0.2'; define("GET_LICENSE_URL", "http://www.intechnic.com/myaccount/license.php"); - define('BACKUP_NAME', 'dump(.*).txt'); // how backup dump files are named $general_error = ''; Index: trunk/kernel/include/parseditem.php =================================================================== diff -u -r105 -r120 --- trunk/kernel/include/parseditem.php (.../parseditem.php) (revision 105) +++ trunk/kernel/include/parseditem.php (.../parseditem.php) (revision 120) @@ -2712,7 +2712,7 @@ if(is_numeric($CountVal[$this->ItemType])) { $this->QueryItemCount = $CountVal[$this->ItemType]; -// echo "CACHE:
"; print_r($CountVal); echo "

"; + //echo "CACHE:
"; print_r($CountVal); echo "

"; } else { Index: trunk/globals.php =================================================================== diff -u -r103 -r120 --- trunk/globals.php (.../globals.php) (revision 103) +++ trunk/globals.php (.../globals.php) (revision 120) @@ -924,7 +924,7 @@ global $objSystemCache, $objSession, $objConfig; if($objConfig->Get("SystemTagCache")) - { + { $name = $tag; if(is_array($attribs)) { Index: trunk/kernel/include/searchitems.php =================================================================== diff -u -r13 -r120 --- trunk/kernel/include/searchitems.php (.../searchitems.php) (revision 13) +++ trunk/kernel/include/searchitems.php (.../searchitems.php) (revision 120) @@ -140,7 +140,8 @@ { $limit = "LIMIT $Start,$PerPage"; } - $sql = "SELECT * FROM ".$this->ResultTable." ".$limit; + $sql = "SELECT * FROM ".$this->ResultTable." ".$limit; + $this->Clear(); $rs = $this->adodbConnection->Execute($sql); return $this->Query_Item($sql); @@ -436,7 +437,7 @@ $this->adodbConnection->Execute("DROP TABLE ".$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."
\n"; $this->adodbConnection->Execute($full_sql); //echo $this->adodbConnection->ErrorMsg()."
\n"; $objSession->SetVariable("Search_Keywords",$this->Phrase); @@ -448,6 +449,8 @@ $this->adodbConnection->Execute($full_sql); //echo $this->adodbConnection->ErrorMsg()."
\n"; } + //Here we need to remove found items which was found by HTML tags matching keywords + //$this->adodbConnection->Execute("DELETE FROM ".$this->ResultTable." WHERE ItemId = 13 AND ItemType = 4"); } function BuildIndexes() Index: trunk/themes/default/search_results.tpl =================================================================== diff -u -r13 -r120 --- trunk/themes/default/search_results.tpl (.../search_results.tpl) (revision 13) +++ trunk/themes/default/search_results.tpl (.../search_results.tpl) (revision 120) @@ -147,7 +147,7 @@ - +