Index: trunk/admin/users/adduser_images.php
===================================================================
diff -u -N -r881 -r1015
--- trunk/admin/users/adduser_images.php	(.../adduser_images.php)	(revision 881)
+++ trunk/admin/users/adduser_images.php	(.../adduser_images.php)	(revision 1015)
@@ -229,9 +229,9 @@
 $sql = "SELECT ELT(img.Enabled+1,'".admin_language("la_Text_Disabled")." ','".admin_language("la_Text_Enabled")." ') as Status, ";
 $sql .="img.AltName as AltName, img.ImageId as ImageId, img.Enabled as Enabled, img.Priority as Priority, ";
 $sql .="concat(img.Name,ELT(img.DefaultImg+1,'','<br>(".admin_language("la_prompt_Primary").") ')) as FullName, ";
-$sql .="if(img.LocalImage=1,'(".admin_language("la_Text_Local").") ',img.Url) as ShowURL, concat( '<IMG src=\"',";
-$sql .="IF (img.LocalThumb=1, CASE WHEN ( LENGTH( img.ThumbPath ) >0 AND img.LocalThumb =1 ) ";
-$sql .="THEN concat('".$rootURL."',img.ThumbPath,'?".time()."') END , img.ThumbUrl), '\">') AS Preview ";
+$sql .="if(img.LocalImage=1 OR (img.SameImages=1 AND img.LocalThumb=1),'(".admin_language("la_Text_Local").") ',img.Url) as ShowURL, concat( '<IMG src=\"',";
+$sql .="IF (img.LocalThumb=1, CASE WHEN ( LENGTH( img.ThumbPath ) >0 ) ";
+$sql .="THEN concat('".$rootURL."',img.ThumbPath,'?".time()."') END , CASE WHEN (img.LocalImage=1) THEN concat('".$rootURL."',img.LocalPath,'?".time()."') ELSE img.ThumbUrl END), '\">') AS Preview ";
 
 $sql .="FROM ".$objImageList->SourceTable." as img WHERE img.ResourceId=".$c->Get("ResourceId");
 
Index: trunk/kernel/include/image.php
===================================================================
diff -u -N -r900 -r1015
--- trunk/kernel/include/image.php	(.../image.php)	(revision 900)
+++ trunk/kernel/include/image.php	(.../image.php)	(revision 1015)
@@ -68,10 +68,16 @@
 		global $pathtoroot;
 
 		$p = $this->Get("ThumbPath");
+		$localp = $this->Get("LocalPath");
 		if(strlen($p))
 		{
 			$parts = pathinfo($pathtoroot.$p);
 			$d = $parts["dirname"]."/";
+		} 
+		elseif (strlen($localp)) 
+		{
+			$parts = pathinfo($pathtoroot.$localp);
+			$d = $parts["dirname"]."/";
 		}
 
 		if($this->Pending)
@@ -517,7 +523,9 @@
 		global $rootURL, $pathtoroot, $objConfig;
 
 		if(strlen($this->Get("ThumbUrl")))
-		return $this->Get("ThumbUrl");
+		{
+			return $this->Get("ThumbUrl");
+		}
 
 		if($this->Get("LocalThumb")=="1")
 		{
@@ -537,7 +545,9 @@
 			return $rootURL."kernel/images/noimage.gif";
 		}
 		else
+		{
 		return $rootURL."kernel/images/noimage.gif";
+		}
 	}
 
 	function ParseObject($element)
@@ -627,6 +637,10 @@
 		$result = $this->adodbConnection->Execute($sql);
 		$this->Set("Priority", $result->fields["p"]+1);
 	}
+	
+	function MakeThumbnail () {
+		
+	}
 }
 
 class clsImageList extends clsItemCollection
Index: trunk/kernel/action.php
===================================================================
diff -u -N -r1009 -r1015
--- trunk/kernel/action.php	(.../action.php)	(revision 1009)
+++ trunk/kernel/action.php	(.../action.php)	(revision 1015)
@@ -1833,7 +1833,7 @@
        
 //       $img->debuglevel=1;
         
-	   $img->Pending=TRUE;	                                 
+	   $img->Pending=false;	                                 
        if($LocalImage)
        {
            $file = $_FILES["imgFullFile"];