summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorartem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-11-15 14:56:21 +0000
committerartem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-11-15 14:56:21 +0000
commitbb428111cfebc82ba9a31e5da0a807033cac41b7 (patch)
treefc8e2208a43ccc32ee4df2eb20a4cb4f112b5d87
parent24c2ec574fb95128703b44d469059825842acd51 (diff)
downloadzabbix-bb428111cfebc82ba9a31e5da0a807033cac41b7.tar.gz
zabbix-bb428111cfebc82ba9a31e5da0a807033cac41b7.tar.xz
zabbix-bb428111cfebc82ba9a31e5da0a807033cac41b7.zip
- [NTT-49] merged rev. 5048:5049 of branches/1.4.j/ (Artem) [fix for maps in "screens" page]
git-svn-id: svn://svn.zabbix.com/trunk@5050 97f52cf1-0a1b-0410-bd0e-c28be96e8082
-rw-r--r--frontends/php/include/maps.inc.php3
-rw-r--r--frontends/php/map.php2
-rw-r--r--frontends/php/maps.php1
3 files changed, 3 insertions, 3 deletions
diff --git a/frontends/php/include/maps.inc.php b/frontends/php/include/maps.inc.php
index f258ffc0..5b3d690e 100644
--- a/frontends/php/include/maps.inc.php
+++ b/frontends/php/include/maps.inc.php
@@ -22,7 +22,8 @@
require_once "include/images.inc.php";
require_once "include/hosts.inc.php";
require_once "include/triggers.inc.php";
-
+ require_once "include/scripts.inc.php";
+
/*
* Function: map_link_drawtypes
*
diff --git a/frontends/php/map.php b/frontends/php/map.php
index 34ca184e..83aaeb27 100644
--- a/frontends/php/map.php
+++ b/frontends/php/map.php
@@ -21,7 +21,7 @@
<?php
require_once "include/config.inc.php";
require_once "include/maps.inc.php";
-
+
$page["title"] = "S_MAP";
$page["file"] = "map.php";
$page["type"] = PAGE_TYPE_IMAGE;
diff --git a/frontends/php/maps.php b/frontends/php/maps.php
index d1f2b703..eda95854 100644
--- a/frontends/php/maps.php
+++ b/frontends/php/maps.php
@@ -20,7 +20,6 @@
?>
<?php
require_once "include/config.inc.php";
- require_once "include/scripts.inc.php";
$page["title"] = "S_NETWORK_MAPS";
$page["file"] = "maps.php";