lib/hosted

Torsten Grote grote at kolabsys.com
Wed Sep 5 15:20:03 CEST 2012


 lib/hosted/kolab_client_task_signup.php |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 9267d6c59d411694f57ef6a6ca5e6c915f55d0d0
Author: Torsten Grote <grote at kolabsys.com>
Date:   Wed Sep 5 15:19:48 2012 +0200

    fixed config_get function for hosted

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;
     }
 }





More information about the commits mailing list