diff options
| author | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-05-22 12:54:59 +0000 |
|---|---|---|
| committer | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-05-22 12:54:59 +0000 |
| commit | 1ea1666e3f79459a3c99f2ef073e965021717536 (patch) | |
| tree | 7629c9553e2cde154239d9f9cc2f8c86243f09a0 /frontends/php/include | |
| parent | 0bbd8c3b373ab8437d977930536c53da643acb45 (diff) | |
| download | zabbix-1ea1666e3f79459a3c99f2ef073e965021717536.tar.gz zabbix-1ea1666e3f79459a3c99f2ef073e965021717536.tar.xz zabbix-1ea1666e3f79459a3c99f2ef073e965021717536.zip | |
- fixed limit error in alarms (Eugene)
- fixed (2. SQL errors in frontend) (Eugene)
from URL: http://www.zabbix.com/forum/showthread.php?t=2837
git-svn-id: svn://svn.zabbix.com/trunk@2876 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include')
| -rw-r--r-- | frontends/php/include/config.inc.php | 5 | ||||
| -rw-r--r-- | frontends/php/include/db.inc.php | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php index 5122429a..bbe2e755 100644 --- a/frontends/php/include/config.inc.php +++ b/frontends/php/include/config.inc.php @@ -1020,7 +1020,10 @@ COpt::profiling_start("page"); { global $page; $class = "horizontal_menu"; - $url = $page["file"]; + if(isset($page["menu.url"])) + $url = $page["menu.url"]; + else + $url = $page["file"]; } else { diff --git a/frontends/php/include/db.inc.php b/frontends/php/include/db.inc.php index 1a998e3d..2af83b98 100644 --- a/frontends/php/include/db.inc.php +++ b/frontends/php/include/db.inc.php @@ -26,7 +26,8 @@ // $DB_TYPE ="POSTGRESQL"; $DB_TYPE ="MYSQL"; $DB_SERVER ="localhost"; - $DB_DATABASE ="zabbix"; +// $DB_DATABASE ="zabbix"; + $DB_DATABASE ="osmiy"; $DB_USER ="root"; $DB_PASSWORD =""; // END OF DATABASE CONFIGURATION |