[Pkg-owncloud-commits] [php-sabre-vobject] 05/32: select() all group properties without specifying the name

David Prévot taffit at moszumanska.debian.org
Fri Nov 28 22:27:08 UTC 2014


This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository php-sabre-vobject.

commit 680a274e571754c4c8b1409c5cca4d34b78b5eed
Author: Armin Hackmann <armin at fruux.com>
Date:   Tue Nov 4 08:11:30 2014 +0100

    select() all group properties without specifying the name
---
 lib/Component.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/Component.php b/lib/Component.php
index 4ac0314..5640152 100644
--- a/lib/Component.php
+++ b/lib/Component.php
@@ -225,8 +225,14 @@ class Component extends Node {
         foreach($this->children as $key=>$child) {
 
             if (
-                strtoupper($child->name) === $name &&
-                (is_null($group) || ( $child instanceof Property && strtoupper($child->group) === $group))
+                (
+                    strtoupper($child->name) === $name
+                    && (is_null($group) || ( $child instanceof Property && strtoupper($child->group) === $group))
+                )
+                || 
+                (
+                    $name === '' && $child instanceof Property && strtoupper($child->group) === $group
+                )
             ) {
 
                 $result[$key] = $child;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabre-vobject.git



More information about the Pkg-owncloud-commits mailing list