Merge branch 'master' of https://github.com/thelia/thelia into yochima-branch

2014-06-19 13:59:16 +02:00
parent 60124feb17 cc4eb2200b
commit 69d496715e
391 changed files with 8886 additions and 2126 deletions
--- a/core/lib/Thelia/Model/ConfigQuery.php
+++ b/core/lib/Thelia/Model/ConfigQuery.php
@@ -73,6 +73,11 @@ class ConfigQuery extends BaseConfigQuery
        return true;
    }

+    public static function getConfiguredShopUrl()
+    {
+        return ConfigQuery::read("url_site", '');
+    }
+
    public static function getDefaultLangWhenNoTranslationAvailable()
    {
        return ConfigQuery::read("default_lang_without_translation", 1);