Merge https://github.com/friendica/red into pending_merge

1 files changed, 33 insertions, 34 deletions

diff --git a/library/Smarty/libs/plugins/modifiercompiler.from_charset.php b/library/Smarty/libs/plugins/modifiercompiler.from_charset.php
index 93b568a5a..dab43e9c3 100644
--- a/library/Smarty/libs/plugins/modifiercompiler.from_charset.php
+++ b/library/Smarty/libs/plugins/modifiercompiler.from_charset.php
@@ -1,34 +1,33 @@
-<?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, $compiler)

-{

-    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] . ')';

-}

-

-?>
\ 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] . ')';
+}