From 0d6400546a1b4de024736d1ef5f3288ad2d07d2f Mon Sep 17 00:00:00 2001 From: Chuck Hagenbuch Date: Sat, 21 Nov 2009 14:20:46 -0500 Subject: [PATCH] Remove some references that aren't needed in PHP 5 code Restore $app loading functionality --- framework/Ui/lib/Horde/Ui/VarRenderer.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/framework/Ui/lib/Horde/Ui/VarRenderer.php b/framework/Ui/lib/Horde/Ui/VarRenderer.php index 0cb07e2ed..9f676fe94 100644 --- a/framework/Ui/lib/Horde/Ui/VarRenderer.php +++ b/framework/Ui/lib/Horde/Ui/VarRenderer.php @@ -59,8 +59,11 @@ class Horde_Ui_VarRenderer } $driver = ucfirst(basename($driver)); - $class = 'Horde_Ui_VarRenderer_' . $driver; + if (!empty($app)) { + include $GLOBALS['registry']->get('fileroot', $app) . '/lib/Ui/VarRenderer/' . $driver . '.php'; + } + $class = 'Horde_Ui_VarRenderer_' . $driver; if (!class_exists($class)) { throw new Horde_Exception('Class definition of ' . $class . ' not found.'); } @@ -73,11 +76,11 @@ class Horde_Ui_VarRenderer * * @param Horde_Form $form A Horde_Form instance, * or null if none is available. - * @param Horde_Form_Variable &$var Reference to a Horde_Form_Variable. - * @param Variables &$vars A Variables instance. + * @param Horde_Form_Variable $va r A Horde_Form_Variable. + * @param Variables $vars A Horde_Variables instance. * @param boolean $isInput Whether this is an input field. */ - public function render($form, &$var, &$vars, $isInput = false) + public function render($form, $var, $vars, $isInput = false) { $state = $isInput ? 'Input' : 'Display'; $method = "_renderVar${state}_" . $var->type->getTypeName(); @@ -97,5 +100,4 @@ class Horde_Ui_VarRenderer { return ''; } - } -- 2.11.0