2 commits - lib/api

Aleksander Machniak machniak at kolabsys.com
Mon Dec 3 18:38:41 CET 2012


 lib/api/kolab_api_service_form_value.php |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit f424f1e7e3d2542b88bff4dfd027f71fab1460cb
Merge: c0dd954 8914264
Author: Aleksander Machniak <machniak at kolabsys.com>
Date:   Mon Dec 3 18:38:34 2012 +0100

    Merge branch 'master' of ssh://git.kolab.org/git/kolab-wap



commit c0dd9549ef51f8dc37216ac00bf9c921e427c1d9
Author: Aleksander Machniak <machniak at kolabsys.com>
Date:   Mon Dec 3 18:37:07 2012 +0100

    FIx empty() usage

diff --git a/lib/api/kolab_api_service_form_value.php b/lib/api/kolab_api_service_form_value.php
index 2beee83..257c570 100644
--- a/lib/api/kolab_api_service_form_value.php
+++ b/lib/api/kolab_api_service_form_value.php
@@ -221,9 +221,9 @@ class kolab_api_service_form_value extends kolab_api_service
                 }
             }
 
-            if (array_key_exists($attr_name, $attribs['form_fields']) && !empty($attribs['form_fields'][$attr_name]['optional']) && !$attribs['form_fields'][$attr_name]['optional']) {
+            if (array_key_exists($attr_name, $attribs['form_fields']) && empty($attribs['form_fields'][$attr_name]['optional'])) {
                 $result[$attr_name] = $this->{$method_name}($attr_value, $postdata);
-            } elseif (array_key_exists($attr_name, $attribs['form_fields']) && !empty($attribs['form_fields'][$attr_name]['validate']) && !$attribs['form_fields'][$attr_name]['validate']) {
+            } else if (array_key_exists($attr_name, $attribs['form_fields']) && empty($attribs['form_fields'][$attr_name]['validate'])) {
                 $result[$attr_name] = $attr_value;
             } else {
                 try {
@@ -232,7 +232,6 @@ class kolab_api_service_form_value extends kolab_api_service
                     Log::debug("Attribute $attr_name did not validate, but it is not a required attribute. Not saving. (Error was: $e)");
                 }
             }
-
         }
 
         Log::trace("kolab_api_form_value::validate() \$result: " . var_export($result, TRUE));





More information about the commits mailing list