Fix path within modifier, delete path to none existing plugin folder

olafgleba · Aug 6, 2012 · 56dda58 · 56dda58
1 parent c9e040b
commit 56dda58
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 14 deletions.
diff --git a/welcompose/core/smarty/software_plugins/modifier.date_atom.php b/welcompose/core/smarty/software_plugins/modifier.date_atom.php
@@ -1,11 +1,7 @@
 <?php
 
-foreach ($smarty->plugins_dir as $value) { 
-    $filepath = $value ."/shared.make_timestamp.php"; 
-    if (file_exists($filepath)) { 
-        require_once $filepath; 
-    } 
-}
+// Reference to origin smarty plugin to include
+require_once SMARTY_DIR.'plugins/shared.make_timestamp.php';
 
 function smarty_modifier_date_atom($string)
 {

diff --git a/welcompose/core/smarty/software_plugins/modifier.date_rss20.php b/welcompose/core/smarty/software_plugins/modifier.date_rss20.php
@@ -1,11 +1,7 @@
 <?php
 
-foreach ($smarty->plugins_dir as $value) { 
-    $filepath = $value ."/shared.make_timestamp.php"; 
-    if (file_exists($filepath)) { 
-        require_once $filepath; 
-    } 
-}
+// Reference to origin smarty plugin to include
+require_once SMARTY_DIR.'plugins/shared.make_timestamp.php';
 
 function smarty_modifier_date_rss20($string)
 {

diff --git a/welcompose/setup/smarty.inc.php b/welcompose/setup/smarty.inc.php
@@ -51,7 +51,6 @@
 $smarty->setCompileDir(SMARTY_TPL_DIR.DIRECTORY_SEPARATOR.'compiled');
 $smarty->setCacheDir(SMARTY_TPL_DIR.DIRECTORY_SEPARATOR.'cache');
 $smarty->setPluginsDir(array(
-	SMARTY_DIR.DIRECTORY_SEPARATOR.'my_plugins',
 	SMARTY_DIR.DIRECTORY_SEPARATOR.'plugins',
 	SMARTY_DIR.DIRECTORY_SEPARATOR.'software_plugins'
 	)

diff --git a/welcompose/update/smarty.inc.php b/welcompose/update/smarty.inc.php
@@ -51,7 +51,6 @@
 $smarty->setCompileDir(SMARTY_TPL_DIR.DIRECTORY_SEPARATOR.'compiled');
 $smarty->setCacheDir(SMARTY_TPL_DIR.DIRECTORY_SEPARATOR.'cache');
 $smarty->setPluginsDir(array(
-	SMARTY_DIR.DIRECTORY_SEPARATOR.'my_plugins',
 	SMARTY_DIR.DIRECTORY_SEPARATOR.'plugins',
 	SMARTY_DIR.DIRECTORY_SEPARATOR.'software_plugins'
 	)