Index: trunk/kernel/include/itemreview.php =================================================================== diff -u -N -r353 -r366 --- trunk/kernel/include/itemreview.php (.../itemreview.php) (revision 353) +++ trunk/kernel/include/itemreview.php (.../itemreview.php) (revision 366) @@ -536,7 +536,7 @@ } //print_pre($idlist); $sql = "DELETE FROM ".$this->SourceTable." WHERE ItemId=$ResourceId ".(count($idlist) > 0 ? "AND ReviewId NOT IN (".implode(",",$idlist).")" : ""); - echo "DEL REVIEW SQL: $sql
"; + //echo "DEL REVIEW SQL: $sql
"; $this->adodbConnection->Execute($sql); @$this->adodbConnection->Execute("DROP TABLE IF EXISTS ".$edit_table); } Index: trunk/kernel/action.php =================================================================== diff -u -N -r361 -r366 --- trunk/kernel/action.php (.../action.php) (revision 361) +++ trunk/kernel/action.php (.../action.php) (revision 366) @@ -638,16 +638,15 @@ } break; case "m_add_relation": - if($_POST["CatEditStatus"]==0) - { $RelList = new clsRelationshipList(); $RelList->SourceTable = $objSession->GetEditTable("Relationship"); //$r = $RelList->Add($_POST["SourceId"],$_POST["SourceType"],$_POST["TargetId"],$_POST["TargetType"], // 0,(int)$_POST["Enabled"],$_POST["RelType"], $Rel); $ado = GetADODBConnection(); - $rs = $ado->Execute("SELECT MIN(RelationshipId) as MinValue FROM ".$RelList->SourceTable); - $NewId = $rs->fields["MinValue"]-1; + $NewId = $ado->GetOne('SELECT MIN(RelationshipId) as MinValue FROM '.$RelList->SourceTable); + if($NewId > 0) $NewId = 0; + $NewId--; $r = $RelList->Add($_POST["SourceId"],$_POST["SourceType"],$_POST["TargetId"],$_POST["TargetType"], 0,(int)$_POST["Enabled"],$_POST["RelType"], $NewId); @@ -656,7 +655,7 @@ if($objSession->HasSystemPermission("DEBUG.LIST")) echo $sql."
\n"; $ado->Execute($sql); - } + break; case "m_edit_relation": if($_POST["CatEditStatus"]==0) @@ -746,10 +745,10 @@ case "m_edit_category": $CreatedOn = DateTimestamp($_POST["cat_date"],GetDateFormat()); - $cat_pick = $_POST["cat_pick"]; + $cat_pick = GetVar('cat_pick', true); $Status = (int)$_POST["status"]; - $Hot=(int)$_POST["itemhot"]; - $Pop = (int)$_POST["itempop"]; + $Hot = false; //(int)$_POST["itemhot"]; + $Pop = false; //(int)$_POST["itempop"]; $New = (int)$_POST["itemnew"]; $html = (int)$_POST["html_enable"]; @@ -1554,10 +1553,9 @@ } $ado = GetADODBConnection(); - $sql = "SELECT MIN(ImageId) as MinValue FROM ".$objImageList->SourceTable; - $rs = $ado->Execute($sql); - $NewId = ($rs->fields["MinValue"]<0)? $rs->fields["MinValue"]-1 : -1; - + $NewId = $ado->GetOne('SELECT MIN(ImageId) as MinValue FROM '.$objImageList->SourceTable); + if($NewId > 0) $NewId = 0; + $NewId--; $img = $objImageList->Add($_POST["imgName"], $_POST["imgAlt"], $_POST["ResourceId"], $LocalImage, $LocalThumb, $full_url, $thumb_url, (int)$_POST["imgEnabled"], 0, (int)$_POST["imgDefault"], 0,(int)$_POST["imgSameImages"], $NewId); $img->Set("ImageId", $NewId); @@ -2108,19 +2106,23 @@ /* category Edit */ if( GetVar('CatEditStatus') == 1 ) { + $adodbConnection = GetADODBConnection(); // $sql = "SELECT * FROM ".$objSession->GetEditTable("Category")." WHERE CategoryId=0"; - $sql = "SELECT * FROM ".$objSession->GetEditTable("Category")." WHERE CategoryId=-1"; + $sql = "SELECT ParentId FROM ".$objSession->GetEditTable("Category")." WHERE CategoryId=-1"; + $rs = $adodbConnection->Execute($sql); while ($rs && !$rs->EOF) { - if($rs->fields["ParentId"]>0) - RunUp($rs->fields["ParentId"],"Increment_Count"); + if($rs->fields["ParentId"] > 0) RunUp($rs->fields["ParentId"],"Increment_Count"); $rs->MoveNext(); } + echo "In ActionTotals: begin
"; + SQLLog('huge: begin'); $objCatList->CopyFromEditTable("CategoryId"); + SQLLog('huge: end'); $objCustomDataList->CopyFromEditTable("CustomDataId"); $objCatList->Clear();