From: Gunnar Wrobel <p@rdus.de>
Date: Fri, 26 Jun 2009 07:24:58 +0000 (+0200)
Subject: Allow to override attribute settings with the global attribute configuration.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=5bd023629699ad89c9198ea8a5928e9f0dff1768;p=horde.git

Allow to override attribute settings with the global attribute configuration.
---

diff --git a/koward/lib/Koward/Form/Object.php b/koward/lib/Koward/Form/Object.php
index dc8001700..a6cd81d3c 100644
--- a/koward/lib/Koward/Form/Object.php
+++ b/koward/lib/Koward/Form/Object.php
@@ -154,6 +154,10 @@ class Koward_Form_Object extends Horde_Form {
                 } else {
                     $form_attributes[$key]['label'] = $key;
                 }
+                if (isset($this->koward->attributes[$key])) {
+                    $form_attributes[$key] = array_merge($form_attributes[$key],
+                                                         $this->koward->attributes[$key]);
+                }
                 if (isset($config['attributes']['fields'][$key])) {
                     $form_attributes[$key] = array_merge($form_attributes[$key],
                                                          $config['attributes']['fields'][$key]);