Author: Lars Michelsen <[email protected]>
Date: Mon Aug 5 13:22:37 2013 +0200
Committer: Lars Michelsen <[email protected]>
Commit-Date: Mon Aug 5 13:22:37 2013 +0200
Fixed some source related view parameters like the backend_id on automaps
---
.../core/classes/CoreAuthorisationModGroups.php | 2 +-
share/server/core/classes/GlobalMapCfg.php | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/share/server/core/classes/CoreAuthorisationModGroups.php
b/share/server/core/classes/CoreAuthorisationModGroups.php
index 61c058e..fe543e9 100644
--- a/share/server/core/classes/CoreAuthorisationModGroups.php
+++ b/share/server/core/classes/CoreAuthorisationModGroups.php
@@ -43,7 +43,7 @@ class CoreAuthorisationModGroups extends
CoreAuthorisationModule {
$this->backends = cfg('global', 'authorisation_group_backends');
if(!$this->backends)
- $this->backends[] = cfg('defaults', 'backend');
+ $this->backends = cfg('defaults', 'backend');
$cacheFile = cfg('paths','var').'group-perms-'.CONST_VERSION.'-cache';
$this->CACHE = new GlobalFileCache($this->file, $cacheFile);
diff --git a/share/server/core/classes/GlobalMapCfg.php
b/share/server/core/classes/GlobalMapCfg.php
index cdef34a..47c64a5 100644
--- a/share/server/core/classes/GlobalMapCfg.php
+++ b/share/server/core/classes/GlobalMapCfg.php
@@ -604,7 +604,7 @@ class GlobalMapCfg {
throw new NagVisException(l('Requested source "[S]" does not
exist',
array('S' =>
$source)));
}
- $keys += self::$viewParams[$source];
+ $keys = array_merge($keys, self::$viewParams[$source]);
}
if(!$only_view_parameters) {
@@ -638,8 +638,9 @@ class GlobalMapCfg {
*/
public function getSourceParams($only_user_supplied = false,
$only_customized = false, $only_view_parameters = false) {
// First get a list of source names to get the parameters for
- $sources = array_merge(array('*'), $this->getValue(0, 'sources'));
- $params = $this->getSourceParamsOfSources($sources,
$only_user_supplied, $only_customized, $only_view_parameters);
+ $config = $this->getValue(0, 'sources') !== false ?
$this->getValue(0, 'sources') : array();
+ $sources = array_merge(array('*'), $config);
+ $params = $this->getSourceParamsOfSources($sources,
$only_user_supplied, $only_customized, $only_view_parameters);
// The map sources might have changed basd on source params - we need
an
// additional run to get params which belong to this sources
------------------------------------------------------------------------------
Get your SQL database under version control now!
Version control is standard for application code, but databases havent
caught up. So what steps can you take to put your SQL databases under
version control? Why should you start doing it? Read more to find out.
http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.clktrk
_______________________________________________
Nagvis-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
