Minor changes.

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

3 files changed, 10 insertions, 2 deletions

diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php
index 01cdb835..3a8914df 100644
--- a/frontends/php/include/config.inc.php
+++ b/frontends/php/include/config.inc.php
@@ -1828,6 +1828,11 @@ echo "</head>";
 	{
 		$ret = 0;
 
+		if($description==""){
+			error(S_INCORRECT_DESCRIPTION);
+			return 0;
+		}
+
 		$description=addslashes($description);
 		$sql="select * from media_type where description='$description'";
 		$result=DBexecute($sql);
diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php
index a8901b37..9d295c5a 100644
--- a/frontends/php/include/forms.inc.php
+++ b/frontends/php/include/forms.inc.php
@@ -1415,7 +1415,7 @@
 			$frmMeadia->AddItemToBottomRow(new CButton("delete",S_DELETE,"return Confirm('".S_DELETE_SELECTED_MEDIA."');"));
 		}
 		$frmMeadia->AddItemToBottomRow(SPACE);
-		$frmMeadia->AddItemToBottomRow(new CButton("calcel",S_CANCEL));
+		$frmMeadia->AddItemToBottomRow(new CButton("cancel",S_CANCEL));
 		$frmMeadia->Show();
 	}
 
@@ -1498,7 +1498,7 @@ function	insert_image_form()
 			$frmScr->AddItemToBottomRow(new CButton("delete",S_DELETE,"return Confirm('".S_DELETE_SCREEN_Q."');"));
 		}
 		$frmScr->AddItemToBottomRow(SPACE);
-		$frmScr->AddItemToBottomRow(new CButton("calcel",S_CANCEL));
+		$frmScr->AddItemToBottomRow(new CButton("cancel",S_CANCEL));
 		$frmScr->Show();	
 	}
 
diff --git a/frontends/php/include/locales/en_gb.inc.php b/frontends/php/include/locales/en_gb.inc.php
index 5cb4a8d6..4a98a76e 100644
--- a/frontends/php/include/locales/en_gb.inc.php
+++ b/frontends/php/include/locales/en_gb.inc.php
@@ -845,5 +845,8 @@
 	"S_AUDIT"=>				"Audit",
 	"S_LOGIN"=>				"Login",
 	"S_LATEST_DATA"=>			"Latest data",
+
+//	Errors
+	"S_INCORRECT_DESCRIPTION"=>		"Incorrect description"
 	);
 ?>