Index: trunk/kernel/include/image.php =================================================================== diff -u -r18 -r271 --- trunk/kernel/include/image.php (.../image.php) (revision 18) +++ trunk/kernel/include/image.php (.../image.php) (revision 271) @@ -329,6 +329,7 @@ function DeleteFromPending() { + global $pathtoroot; $ThumbPath = $pathtoroot.$this->Get("ThumbPath"); $FullPath = $pathtoroot.$this->Get("LocalPath"); @@ -926,7 +927,8 @@ { $i->CopyFromPending(); - $t = $i->Get("LocalPath"); + $t = $i->Get("LocalPath"); + $p = pathinfo($t); $p_arr = explode("/", $p['dirname']); if (eregi("pending", $p_arr[count($p_arr)-1])) @@ -989,7 +991,7 @@ global $objSession; $edit_table = $objSession->GetEditTable($this->SourceTable); - @$this->adodbConnection->Execute("DROP TABLE $edit_table"); + @$this->adodbConnection->Execute("DROP TABLE IF EXISTS $edit_table"); if(is_array($idlist)) { $list = implode(",",$idlist); @@ -1096,7 +1098,7 @@ $edit_table = $objSession->GetEditTable($this->SourceTable); $this->DeletePendingFiles($edit_table); - @$this->adodbConnection->Execute("DROP TABLE $edit_table"); + @$this->adodbConnection->Execute("DROP TABLE IF EXISTS $edit_table"); } function GetNextImageIndex($ResourceId)