Merge branch 'master' into uiunittests

Conflicts:
	tests/PHPUnit/UI

1 files changed, 10 insertions, 0 deletions

diff --git a/core/Config.php b/core/Config.php
index 67efc8a507..7d973a01e1 100644
--- a/core/Config.php
+++ b/core/Config.php
@@ -189,6 +189,16 @@ class Config extends Singleton
         return $this->getHostname();
     }
 
+    public function getClientSideOptions()
+    {
+        $general = $this->General;
+
+        return array(
+            'action_url_category_delimiter' => $general['action_url_category_delimiter'],
+            'autocomplete_min_sites' => $general['autocomplete_min_sites']
+        );
+    }
+
     protected static function getByDomainConfigPath()
     {
         $host       = self::getHostname();