[Tikiwiki-cvs] tiki tiki-browse_image.php,1.24.2.25,1.24.2.26

[<to...@us...>]

Update of /cvsroot/tikiwiki/tiki
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv2880

Modified Files:
      Tag: BRANCH-1-9
	tiki-browse_image.php 
Log Message:
Ooops some $itype missed the death train


Index: tiki-browse_image.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-browse_image.php,v
retrieving revision 1.24.2.25
retrieving revision 1.24.2.26
diff -u -d -r1.24.2.25 -r1.24.2.26
--- tiki-browse_image.php	8 Aug 2006 18:36:53 -0000	1.24.2.25
+++ tiki-browse_image.php	8 Aug 2006 18:41:31 -0000	1.24.2.26
@@ -113,15 +113,10 @@
 $scalesize = 0;
 if (isset($_REQUEST["scalesize"])) {
     if (is_numeric($_REQUEST["scalesize"]) && $_REQUEST["scalesize"] > 0) {
-    	$itype = 's';
     	$scalesize = $_REQUEST["scalesize"];
     } else {
-    	$itype = 'o';
     }
-} elseif ($gal_info['defaultscale'] =='o') {
-	$itype = 'o';
-} else {
-	$itype = 's';
+} elseif ($gal_info['defaultscale'] !=='o') {
 	$scalesize = $gal_info['defaultscale'];
 }
 $arrscales = $imagegallib->get_gallery_scale_info($galleryId);
@@ -136,7 +131,6 @@
     }
     $scalesize = $testscale;
 }
-$smarty->assign_by_ref('itype', $itype);
 $smarty->assign_by_ref('scalesize', $scalesize);
 $smarty->assign('same_scale', "&scalesize={$scalesize}");
 
@@ -279,7 +273,7 @@
 }
 $smarty->assign('resultscale', $resultscale);
 if ($resultscale) {
-    $info = $imagegallib->get_image_info($imageId, $itype, $resultscale);
+    $info = $imagegallib->get_image_info($imageId, 's', $resultscale);
     $smarty->assign('xsize_scaled', $info["xsize"]);
     $smarty->assign('ysize_scaled', $info["ysize"]);
 }