Index: trunk/admin/users/adduser_images.php
===================================================================
diff -u -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");