Merge branch 'develop' of https://github.com/friendica/friendica into develop

[friendica.git] / library / Smarty / libs / plugins / modifiercompiler.from_charset.php

diff --git a/library/Smarty/libs/plugins/modifiercompiler.from_charset.php b/library/Smarty/libs/plugins/modifiercompiler.from_charset.php
index 93b568a5a87f11a4b14b4e9bfe6e56985145755e..dab43e9c3b9f2463fc236f408155e070a46e6bce 100644 (file)
--- a/library/Smarty/libs/plugins/modifiercompiler.from_charset.php
+++ b/library/Smarty/libs/plugins/modifiercompiler.from_charset.php
@@ -1,34 +1,33 @@
-<?php\r
-/**\r
- * Smarty plugin\r
- *\r
- * @package Smarty\r
- * @subpackage PluginsModifierCompiler\r
- */\r
-\r
-/**\r
- * Smarty from_charset modifier plugin\r
- *\r
- * Type:     modifier<br>\r
- * Name:     from_charset<br>\r
- * Purpose:  convert character encoding from $charset to internal encoding\r
- *\r
- * @author Rodney Rehm\r
- * @param array $params parameters\r
- * @return string with compiled code\r
- */\r
-function smarty_modifiercompiler_from_charset($params, $compiler)\r
-{\r
-    if (!Smarty::$_MBSTRING) {\r
-        // FIXME: (rodneyrehm) shouldn't this throw an error?\r
-        return $params[0];\r
-    }\r
-\r
-    if (!isset($params[1])) {\r
-        $params[1] = '"ISO-8859-1"';\r
-    }\r
-\r
-    return 'mb_convert_encoding(' . $params[0] . ', "' . addslashes(Smarty::$_CHARSET) . '", ' . $params[1] . ')';\r
-}\r
-\r
-?>
\ No newline at end of file
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+
+/**
+ * Smarty from_charset modifier plugin
+ * Type:     modifier<br>
+ * Name:     from_charset<br>
+ * Purpose:  convert character encoding from $charset to internal encoding
+ *
+ * @author Rodney Rehm
+ *
+ * @param array $params parameters
+ *
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_from_charset($params)
+{
+    if (!Smarty::$_MBSTRING) {
+        // FIXME: (rodneyrehm) shouldn't this throw an error?
+        return $params[0];
+    }
+
+    if (!isset($params[1])) {
+        $params[1] = '"ISO-8859-1"';
+    }
+
+    return 'mb_convert_encoding(' . $params[0] . ', "' . addslashes(Smarty::$_CHARSET) . '", ' . $params[1] . ')';
+}