summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTorsten Grote <grote@kolabsys.com>2012-09-05 15:19:48 +0200
committerTorsten Grote <grote@kolabsys.com>2012-09-05 15:19:48 +0200
commit9267d6c59d411694f57ef6a6ca5e6c915f55d0d0 (patch)
tree27e9ec73932fe7af6d02d4cb662ad322bf68ebc6
parent052ee511388c7525edd126abfcb5d7232f4bd1bb (diff)
downloadwebadmin-9267d6c59d411694f57ef6a6ca5e6c915f55d0d0.tar.gz
fixed config_get function for hosted
-rw-r--r--lib/hosted/kolab_client_task_signup.php10
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/hosted/kolab_client_task_signup.php b/lib/hosted/kolab_client_task_signup.php
index fdb644c..316943b 100644
--- a/lib/hosted/kolab_client_task_signup.php
+++ b/lib/hosted/kolab_client_task_signup.php
@@ -264,7 +264,7 @@ class kolab_client_task_signup extends kolab_client_task
return $form->output();
}
- private function get_domains() {
+ protected function get_domains() {
// Get a list of domains ($domains again is a kolab_client_api_result instance)
$domains_list = $this->api->get('domains.list')->get('list');
@@ -310,12 +310,16 @@ class kolab_client_task_signup extends kolab_client_task
*
* @param string $name Option name
* @param mixed $fallback Default value
+ * @param int $type Value type (one of Conf class constants)
*
* @return mixed Option value
*/
- public function config_get($name, $fallback = null)
+ public function config_get($name, $fallback = null, $type = null)
{
- $value = $this->config->get('kolab_hosting', $name);
+ $value = $this->config->get('kolab_hosting', $name, $type);
+ if($value === null) {
+ $value = parent::config_get($name, $fallback, $type);
+ }
return $value !== null ? $value : $fallback;
}
}