From fa10e0945ecd45bfe78a2c8fb015a43092b4944b Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Thu, 10 Dec 2015 14:02:22 +0100
Subject: bug #385 update to smarty-3.1.28-dev (from Github)

---
 .../smarty/libs/plugins/modifiercompiler.strip_tags.php  | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'include/smarty/libs/plugins/modifiercompiler.strip_tags.php')

diff --git a/include/smarty/libs/plugins/modifiercompiler.strip_tags.php b/include/smarty/libs/plugins/modifiercompiler.strip_tags.php
index 9ba71e3d9..3e6e13048 100644
--- a/include/smarty/libs/plugins/modifiercompiler.strip_tags.php
+++ b/include/smarty/libs/plugins/modifiercompiler.strip_tags.php
@@ -2,32 +2,28 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
 
 /**
  * Smarty strip_tags modifier plugin
- *
  * Type:     modifier<br>
  * Name:     strip_tags<br>
  * Purpose:  strip html tags from text
  *
- * @link http://www.smarty.net/manual/en/language.modifier.strip.tags.php strip_tags (Smarty online manual)
+ * @link   http://www.smarty.net/manual/en/language.modifier.strip.tags.php strip_tags (Smarty online manual)
  * @author Uwe Tews
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
-function smarty_modifiercompiler_strip_tags($params, $compiler)
+function smarty_modifiercompiler_strip_tags($params)
 {
-   if (!isset($params[1])) {
-        $params[1] = true;
-    }
-    if ($params[1] === true) {
+    if (!isset($params[1]) || $params[1] === true || trim($params[1], '"') == 'true') {
         return "preg_replace('!<[^>]*?>!', ' ', {$params[0]})";
     } else {
         return 'strip_tags(' . $params[0] . ')';
     }
 }
-
-?>
\ No newline at end of file
-- 
cgit v1.2.3


From 3282ddbe2ea305edbb0b3ae84b6860c0d90ab072 Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Tue, 15 Dec 2015 15:24:01 +0100
Subject: update Smarty to official version 3.1.28

---
 include/smarty/libs/plugins/modifiercompiler.strip_tags.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/smarty/libs/plugins/modifiercompiler.strip_tags.php')

diff --git a/include/smarty/libs/plugins/modifiercompiler.strip_tags.php b/include/smarty/libs/plugins/modifiercompiler.strip_tags.php
index 3e6e13048..da5d364cb 100644
--- a/include/smarty/libs/plugins/modifiercompiler.strip_tags.php
+++ b/include/smarty/libs/plugins/modifiercompiler.strip_tags.php
@@ -12,7 +12,7 @@
  * Name:     strip_tags<br>
  * Purpose:  strip html tags from text
  *
- * @link   http://www.smarty.net/manual/en/language.modifier.strip.tags.php strip_tags (Smarty online manual)
+ * @link   http://www.smarty.net/docs/en/language.modifier.strip.tags.tpl strip_tags (Smarty online manual)
  * @author Uwe Tews
  *
  * @param array $params parameters
-- 
cgit v1.2.3