Merge branch 'master' of https://github.com/sourcefabric/Newscoop

sourcefabric · Feb 10, 2015 · 70789d9 · 70789d9
2 parents f22f374 + 96e410d
commit 70789d9
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/newscoop/template_engine/classes/CampURIShortNames.php b/newscoop/template_engine/classes/CampURIShortNames.php
@@ -82,6 +82,8 @@ public function __construct($p_uri = null)
                 if ($template->defined()) {
                     $this->m_template = $template;
                 }
+
+                CampTemplate::singleton()->config_dir = APPLICATION_PATH . '/../themes/' . $themePath . '_conf';
             }
 
             CampTemplate::singleton()->trigger_error($e->getMessage());