tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2011-03-31 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* include/config_process.php: Fixed wrong condition when global 
	configuration for "flash_charts" option is override by user value.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4157 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2011-03-31 15:29:18 +00:00
parent 27df1ee485
commit 20a096e509
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2011-03-31 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/config_process.php: Fixed wrong condition when global
configuration for "flash_charts" option is override by user value.
2011-03-31 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 2011-03-31 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/db/oracle.php: Added new functions for Oracle support. * include/db/oracle.php: Added new functions for Oracle support.

4
pandora_console/include/config_process.php
View File

@ -104,9 +104,9 @@ if (isset ($config['id_user'])){
} }
// If block_size or flash_chart are provided then override global settings // If block_size or flash_chart are provided then override global settings
if (!empty($userinfo["block_size"]) && $userinfo["block_size"] != 0) if (!empty($userinfo["block_size"]) && ($userinfo["block_size"] != 0))
$config["block_size"] = $userinfo["block_size"]; $config["block_size"] = $userinfo["block_size"];
if (!empty($userinfo["flash_charts"]) && $userinfo["flash_charts"] == -1) if ($userinfo["flash_chart"] != -1)
$config["flash_charts"] = $userinfo["flash_chart"]; $config["flash_charts"] = $userinfo["flash_chart"];
// Each user could have it's own timezone) // Each user could have it's own timezone)