diff options
| author | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-01-21 15:44:31 +0000 |
|---|---|---|
| committer | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-01-21 15:44:31 +0000 |
| commit | b6f0565a4e0809d29950d26e95050ff4a3deaa8f (patch) | |
| tree | 4965433b13f68c7c51119e0a7744ce7f6004c7fe /frontends/php/include/page_header.php | |
| parent | 3e8c5c43f93bdc2cea90a021eedee58327d83641 (diff) | |
| download | zabbix-b6f0565a4e0809d29950d26e95050ff4a3deaa8f.tar.gz zabbix-b6f0565a4e0809d29950d26e95050ff4a3deaa8f.tar.xz zabbix-b6f0565a4e0809d29950d26e95050ff4a3deaa8f.zip | |
- [DEV-97] added screen for easier creation of locales (Artem);
- [ZBX-253] fixes problem in frontend with long int values (Artem)
git-svn-id: svn://svn.zabbix.com/trunk@5268 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include/page_header.php')
| -rw-r--r-- | frontends/php/include/page_header.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/frontends/php/include/page_header.php b/frontends/php/include/page_header.php index 993091f6..c4692d5f 100644 --- a/frontends/php/include/page_header.php +++ b/frontends/php/include/page_header.php @@ -37,7 +37,7 @@ COpt::profiling_start("page"); include_once "include/locales/en_gb.inc.php"; process_locales(); - + set_zbx_locales(); /* Init CURRENT NODE ID */ init_nodes(); @@ -55,7 +55,10 @@ COpt::profiling_start("page"); break; case PAGE_TYPE_HTML: default: - header('Content-Type: text/html; charset='.S_HTML_CHARSET); + if(!isset($page['encoding'])) + header('Content-Type: text/html; charset='.S_HTML_CHARSET); + else + header('Content-Type: text/html; charset='.$page['encoding']); if(isset($page['title']) && defined($page['title'])) $page['title'] = constant($page['title']); @@ -194,6 +197,7 @@ COpt::profiling_start("page"); array("url"=>"scripts.php" ,"label"=>S_SCRIPTS), array("url"=>"audit.php" ,"label"=>S_AUDIT ), array("url"=>"report4.php" ,"label"=>S_NOTIFICATIONS ), + array("url"=>"locales.php" ,"label"=>S_LOCALES ), array("url"=>"instal.php" ,"label"=>S_INSTALLATION , "sub_pages"=>array("setup.php","warning.php")) ) |