Updated smarty to 1.0.9

[gosa.git] / gosa-core / include / smarty / plugins / block.textformat.php

diff --git a/gosa-core/include/smarty/plugins/block.textformat.php b/gosa-core/include/smarty/plugins/block.textformat.php
index 733f6e234907d2421de9bb2025fc2673269f754f..517fd62dd5274284c9f6256aa988a36c1b5f3271 100644 (file)
--- a/gosa-core/include/smarty/plugins/block.textformat.php
+++ b/gosa-core/include/smarty/plugins/block.textformat.php
@@ -27,12 +27,11 @@
  * </pre>
  * @author Monte Ohrt <monte at ohrt dot com> 
  * @param string $content contents of the block
- * @param object $smarty Smarty object
- * @param boolean &$repeat repeat flag
  * @param object $template template object
+ * @param boolean &$repeat repeat flag
  * @return string content re-formatted
  */
-function smarty_block_textformat($params, $content, $smarty, &$repeat, $template)
+function smarty_block_textformat($params, $content, $template, &$repeat)
 {
     if (is_null($content)) {
         return;
@@ -67,7 +66,7 @@ function smarty_block_textformat($params, $content, $smarty, &$repeat, $template
                 break;
 
             default:
-                $smarty->trigger_error("textformat: unknown attribute '$_key'");
+                trigger_error("textformat: unknown attribute '$_key'");
         } 
     }