add smarty as submodule

diff --git a/.gitmodules b/.gitmodules
new file mode 100644 (file)
index 0000000..a0c0782
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "lib/api/smarty"]
+       path = lib/api/smarty
+       url = https://github.com/smarty-php/smarty.git

diff --git a/lib/api/smarty b/lib/api/smarty
new file mode 160000 (submodule)
index 0000000..b58771e
--- /dev/null
+++ b/lib/api/smarty
@@ -0,0 +1 @@
+Subproject commit b58771e31b11c721f6aa8e574e16e4058f9edc5f

diff --git a/lib/system/DNS.class.php b/lib/system/DNS.class.php
index 976b9fb7a4409b967cda0bebf03198d74779157d..80725200616f543fb87efddb34068a8423e8d8ad 100644 (file)
--- a/lib/system/DNS.class.php
+++ b/lib/system/DNS.class.php
@@ -260,12 +260,15 @@ class DNS {
                        $tpl = self::getSession()->tpl;
                }
                
-               require_once(DNS_DIR.'/lib/api/smarty/Smarty.class.php');
+               require_once(DNS_DIR.'/lib/api/smarty/libs/Smarty.class.php');
                self::$tplObj = new \Smarty;
                
                self::getTPL()->setTemplateDir(DNS_DIR."/templates/".$tpl);
                self::getTPL()->setCompileDir(DNS_DIR."/templates/compiled/".$tpl);
-               self::getTPL()->setPluginsDir(DNS_DIR."/lib/api/smarty/plugins");
+               self::getTPL()->setPluginsDir(array(
+                       DNS_DIR."/lib/api/smarty/libs/plugins",
+                       DNS_DIR."/lib/template/plugins"
+               ));
                self::getTPL()->loadFilter('pre', 'hascontent');
                
                if (!ENABLE_DEBUG) {