[Tikiwiki-cvs] tiki/lib/imagegals imagegallib.php,1.45.2.14,1.45.2.15

[<re...@us...>]

Update of /cvsroot/tikiwiki/tiki/lib/imagegals
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29496/lib/imagegals

Modified Files:
      Tag: BRANCH-1-9
	imagegallib.php 
Log Message:
Instant-Auto-Merge from BRANCH-1-8 to BRANCH-1-9

Index: imagegallib.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/lib/imagegals/imagegallib.php,v
retrieving revision 1.45.2.14
retrieving revision 1.45.2.15
diff -u -d -r1.45.2.14 -r1.45.2.15
--- imagegallib.php	8 Feb 2005 11:32:22 -0000	1.45.2.14
+++ imagegallib.php	11 Feb 2005 19:48:40 -0000	1.45.2.15
@@ -847,7 +847,12 @@
 			@unlink ($gal_use_dir . $path);
 
 			@unlink ($gal_use_dir . $path . '.thumb');
-		//todo: remove scaled images
+		  // remove scaled images
+		  $query = "select i.`path`, d.`xsize`, d.`ysize` from `tiki_images` i, `tiki_images_data` d where i.`imageId`=d.`imageId` and i.`imageId`=? and d.`type`=?";
+		  $result=$this->query($query,array($id,'s'));
+		  while($res = $result->fetchRow()) {
+                    @unlink ($gal_use_dir . $path . '.scaled_'.$res['xsize'].'x'.$res['ysize']);
+		  }
 		}
 
 		$query = "delete from `tiki_images` where `imageId`=?";