summaryrefslogtreecommitdiffstats
path: root/frontends
diff options
context:
space:
mode:
authorartem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2008-08-12 15:16:50 +0000
committerartem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2008-08-12 15:16:50 +0000
commitbfd73c73a40c1e5e6515462ca36b16d19b8a8d30 (patch)
tree7a8686bc359abdc152da242a9f3a72b79e737449 /frontends
parent43e14ba71f408eb30acd4c46a22e7f7ecb65c997 (diff)
downloadzabbix-bfd73c73a40c1e5e6515462ca36b16d19b8a8d30.tar.gz
zabbix-bfd73c73a40c1e5e6515462ca36b16d19b8a8d30.tar.xz
zabbix-bfd73c73a40c1e5e6515462ca36b16d19b8a8d30.zip
- [DEV-201] fixes to code (Artem)
git-svn-id: svn://svn.zabbix.com/trunk@5900 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends')
-rw-r--r--frontends/php/exp_imp.php1
-rw-r--r--frontends/php/include/items.inc.php2
2 files changed, 1 insertions, 2 deletions
diff --git a/frontends/php/exp_imp.php b/frontends/php/exp_imp.php
index 31c58bf3..f660febd 100644
--- a/frontends/php/exp_imp.php
+++ b/frontends/php/exp_imp.php
@@ -146,7 +146,6 @@ include_once "include/page_header.php";
$result = $importer->Parse($_FILES['import_file']['tmp_name']);
unset($importer);
-
$result = DBend($result);
show_messages($result, S_IMPORTED.SPACE.S_SUCCESSEFULLY_SMALL, S_IMPORT.SPACE.S_FAILED_SMALL);
diff --git a/frontends/php/include/items.inc.php b/frontends/php/include/items.inc.php
index 3e6769e1..fa646994 100644
--- a/frontends/php/include/items.inc.php
+++ b/frontends/php/include/items.inc.php
@@ -519,7 +519,7 @@
if($db_item["templateid"] == 0)
continue;
- if( !is_null($templateid)){
+ if( !is_null($templateids)){
$db_tmp_item = get_item_by_itemid($db_item["templateid"]);
if(!uint_in_array($db_tmp_item["hostid"], $templateids)) continue;