diff options
| author | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-08-29 10:57:20 +0000 |
|---|---|---|
| committer | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-08-29 10:57:20 +0000 |
| commit | 3653f1a561dccc45bf9823882cbfeeee117ea5ca (patch) | |
| tree | ce21e6f9ba9d342c387e99b95365b7a6bfaa3610 /frontends/php | |
| parent | 971a6233f5b5c95361fff6fc9ee671de5958bd1e (diff) | |
| download | zabbix-3653f1a561dccc45bf9823882cbfeeee117ea5ca.tar.gz zabbix-3653f1a561dccc45bf9823882cbfeeee117ea5ca.tar.xz zabbix-3653f1a561dccc45bf9823882cbfeeee117ea5ca.zip | |
proted r3218:3224 from 1.1.2
git-svn-id: svn://svn.zabbix.com/trunk@3228 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php')
| -rw-r--r-- | frontends/php/include/classes/graph.inc.php | 2 | ||||
| -rw-r--r-- | frontends/php/include/config.inc.php | 3 | ||||
| -rw-r--r-- | frontends/php/include/locales/en_gb.inc.php | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/frontends/php/include/classes/graph.inc.php b/frontends/php/include/classes/graph.inc.php index abd56005..53e6fb6c 100644 --- a/frontends/php/include/classes/graph.inc.php +++ b/frontends/php/include/classes/graph.inc.php @@ -272,7 +272,7 @@ if($value <= 0) $value = NULL; if(is_null($value)) $value = 900; - $this->sizeYi = $value; + $this->sizeY = $value; } function setBorder($border) diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php index 84105782..d85519cf 100644 --- a/frontends/php/include/config.inc.php +++ b/frontends/php/include/config.inc.php @@ -866,6 +866,9 @@ COpt::profiling_start("page"); if($noauth==0) { + global $TRANSLATION; + if(!isset($TRANSLATION) || !is_array($TRANSLATION)) $TRANSLATION = array(); + check_authorisation(); include_once "include/locales/".$USER_DETAILS["lang"].".inc.php"; process_locales(); diff --git a/frontends/php/include/locales/en_gb.inc.php b/frontends/php/include/locales/en_gb.inc.php index 26e03bd0..82fcd6b8 100644 --- a/frontends/php/include/locales/en_gb.inc.php +++ b/frontends/php/include/locales/en_gb.inc.php @@ -779,7 +779,7 @@ "S_VERTICAL_ALIGN"=> "Vertical align", "S_TOP"=> "Top", "S_MIDDLE"=> "Middle", - "S_BOTTOM"=> "Buttom", + "S_BOTTOM"=> "Bottom", // screens.php "S_CUSTOM_SCREENS"=> "Custom screens", |