From 7b15c4b47dc39aabf79d820ac799e998a45b8616 Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Mon, 24 Oct 2011 22:06:44 +0000 Subject: [PATCH] functions.inc.php: - pacol(): use Lang::read instead of global $PALANG (which is undefined when called from a *Handler class) git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1234 a1433add-5e2c-0410-b055-b7f2511e0802 --- functions.inc.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/functions.inc.php b/functions.inc.php index b489a248..a2b365bc 100644 --- a/functions.inc.php +++ b/functions.inc.php @@ -406,10 +406,8 @@ function safecookie ($param, $default="") { * @return array for $struct */ function pacol($allow_editing, $display_in_form, $display_in_list, $type, $PALANG_label, $PALANG_desc, $default = "", $options = array(), $not_in_db=0, $select="", $extrafrom="") { - global $PALANG; - - if ($PALANG_label != '') $PALANG_label = $PALANG[$PALANG_label]; - if ($PALANG_desc != '') $PALANG_desc = $PALANG[$PALANG_desc ]; + if ($PALANG_label != '') $PALANG_label = Lang::Read($PALANG_label); + if ($PALANG_desc != '') $PALANG_desc = Lang::Read($PALANG_desc ); return array( 'editable' => $allow_editing,