- fixed image storing for oracle (Eugene)

git-svn-id: svn://svn.zabbix.com/trunk@2884 97f52cf1-0a1b-0410-bd0e-c28be96e8082

1 files changed, 2 insertions, 7 deletions

diff --git a/frontends/php/map.php b/frontends/php/map.php
index 56f74d69..b6198eee 100644
--- a/frontends/php/map.php
+++ b/frontends/php/map.php
@@ -83,13 +83,10 @@
 	$x=imagesx($im); 
 	$y=imagesy($im);
   
-#	ImageFilledRectangle($im,0,0,$width,$height,$black);
+	ImageFilledRectangle($im,0,0,$width,$height,$white);
 	if($background!="")
 	{
-		$db_images = DBselect("select image from images".
-			" where imagetype=2 and name=".zbx_dbstr($background));
-
-		$db_image = DBfetch($db_images);
+		$db_image = get_image_by_name($background, 2);
 		if($db_image)
 		{
 			$back = ImageCreateFromString($db_image["image"]);
@@ -97,14 +94,12 @@
 		}
 		else
 		{
-			ImageFilledRectangle($im,0,0,$width,$height,$white);
 			$x=imagesx($im)/2-ImageFontWidth(4)*strlen($name)/2;
 			ImageString($im, 4,$x,1, $name , $darkred);
 		}
 	}
 	else
 	{
-		ImageFilledRectangle($im,0,0,$width,$height,$white);
 		$x=imagesx($im)/2-ImageFontWidth(4)*strlen($name)/2;
 		ImageString($im, 4,$x,1, $name , $colors["Dark Red"]);
 	}