diff options
| author | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-05-20 08:15:04 +0000 |
|---|---|---|
| committer | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-05-20 08:15:04 +0000 |
| commit | 6553086bcd2e5135a4ffd1721dc702d1dd523866 (patch) | |
| tree | 498b264452d8cf1a73078d67814df4f99f85ca78 /frontends/php/include | |
| parent | d36aeae3b8fa5359063fad31aeb219b146c6f124 (diff) | |
| download | zabbix-6553086bcd2e5135a4ffd1721dc702d1dd523866.tar.gz zabbix-6553086bcd2e5135a4ffd1721dc702d1dd523866.tar.xz zabbix-6553086bcd2e5135a4ffd1721dc702d1dd523866.zip | |
- [DEV-137] fixed installation warning (Artem)
git-svn-id: svn://svn.zabbix.com/trunk@5718 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include')
| -rw-r--r-- | frontends/php/include/config.inc.php | 2 | ||||
| -rw-r--r-- | frontends/php/include/defines.inc.php | 3 | ||||
| -rw-r--r-- | frontends/php/include/page_header.php | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php index 0f157cb5..14258be4 100644 --- a/frontends/php/include/config.inc.php +++ b/frontends/php/include/config.inc.php @@ -181,7 +181,7 @@ function TODO($msg) { echo "TODO: ".$msg.SBR; } // DEBUG INFO!!! } //*/ -// Ajax do not need warnings or Errors +// Ajax - do not need warnings or Errors if((isset($DENY_GUI) || isset($show_setup) || isset($show_warning)) && (PAGE_TYPE_HTML <> detect_page_type(PAGE_TYPE_HTML))){ header('Ajax-response: false'); exit(); diff --git a/frontends/php/include/defines.inc.php b/frontends/php/include/defines.inc.php index 42edde1c..ef5d33ab 100644 --- a/frontends/php/include/defines.inc.php +++ b/frontends/php/include/defines.inc.php @@ -440,7 +440,8 @@ if((ini_get('mbstring.func_overload') > 5)){ define('ZBX_MBSTRINGS_OVERLOADED',1); define('ZBX_EREG_SPACE_SYMB','\-'); -}else{ +} +else{ define('ZBX_EREG_SPACE_SYMB','-'); } define('ZBX_EREG_INTERNAL_NAMES', '([0-9a-zA-Z_.[:space:][.'.ZBX_EREG_SPACE_SYMB.'.]$]+)'); diff --git a/frontends/php/include/page_header.php b/frontends/php/include/page_header.php index 858dd33c..11cf0141 100644 --- a/frontends/php/include/page_header.php +++ b/frontends/php/include/page_header.php @@ -74,7 +74,7 @@ COpt::profiling_start("page"); if(!isset($page['title'])) $page['title'] = 'ZABBIX'; if(defined('ZBX_DISTRIBUTED')){ - if($curr_node_data = DBfetch(DBselect('select * from nodes where nodeid='.get_current_nodeid(false)))) + if(isset($DB['DB']) && ($curr_node_data = DBfetch(DBselect('select * from nodes where nodeid='.get_current_nodeid(false))))) $page['title'] .= ' ('.$curr_node_data['name'].')'; } @@ -594,4 +594,4 @@ COpt::compare_files_with_menu($ZBX_MENU); } show_messages(); -?> +?>
\ No newline at end of file |