Control: tags -1 patch Hi all, On Fr 05 Apr 2019 00:31:03 CEST, Wolfgang Schweer wrote:
Ping this bug again to keep the chance to fix it. Wolfgang
Patch attached. Sorry for the dramatic pause before sitting down and finding a fix. Please test.
Mike -- DAS-NETZWERKTEAM c\o Technik- und Ökologiezentrum Eckernförde Mike Gabriel, Marienthaler str. 17, 24340 Eckernförde mobile: +49 (1520) 1976 148 landline: +49 (4354) 8390 139 GnuPG Fingerprint: 9BFB AEE8 6C0A A5FF BF22 0782 9AF4 6B30 2577 1B31 mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
--- a/gosa-core/include/smartyAddons/block.render.php
+++ b/gosa-core/include/smartyAddons/block.render.php
@@ -1,6 +1,6 @@
<?php
-function smarty_block_render($params, $text, &$smarty)
+function smarty_block_render($params, $text)
{
/* Skip closing tag </render> */
if(empty($text)) {
--- a/gosa-core/include/smartyAddons/block.tr.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-function smarty_block_tr($params, $text, &$smarty)
-{
- $plugin = "";
- if(!isset($params['domain'])){
- if(strlen($text) != 0){
- $trace = debug_backtrace();
- $base = preg_replace("/\/html/","",getcwd());
- foreach($trace as $t_entry){
- if(preg_match("/^".preg_quote($base,'/')."\/plugins\//", $t_entry['file'])){
- $plugin = preg_replace("/^".preg_quote($base,'/')."\/plugins\/([^\/]*).*$/", "\\1", $t_entry['file']);
- break;
- }
- }
- }
- }
-
-
- if($plugin != ""){
- return(dgettext($plugin, $text));
- }
- return(gettext($text));
-}
-
-?>
--- a/gosa-core/include/smartyAddons/function.factory.php
+++ b/gosa-core/include/smartyAddons/function.factory.php
@@ -1,6 +1,6 @@
<?php
-function smarty_function_factory($params, &$smarty)
+function smarty_function_factory($params, $smarty)
{
// Capture params
--- a/gosa-core/include/smartyAddons/function.image.php
+++ b/gosa-core/include/smartyAddons/function.image.php
@@ -1,6 +1,6 @@
<?php
-function smarty_function_image($params, &$smarty)
+function smarty_function_image($params, $smarty)
{
$path = (isset($params['path']))? $params['path'] :"";
$action = (isset($params['action']))? $params['action'] :"";
--- a/gosa-core/include/smartyAddons/function.msgPool.php
+++ b/gosa-core/include/smartyAddons/function.msgPool.php
@@ -1,6 +1,6 @@
<?php
-function smarty_function_msgPool($params, &$smarty)
+function smarty_function_msgPool($params, $smarty)
{
if(class_available("msgPool") && isset($params['type'])){
$parameter = array();
Attachment:
pgpN1yIfJ3ztB.pgp
Description: Digitale PGP-Signatur