diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2008-12-11 13:15:00 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2008-12-11 13:15:00 -0500 |
| commit | 939a400fd3dc43216a7c43bcfb66fb18fb557279 (patch) | |
| tree | 36c548b4844e64018460727f228d377ddc35c93f /extlib/XMPPHP/XMLObj.php | |
| parent | fb837b86c5ab46f92fba37db0d37d49071d71a74 (diff) | |
upgrade XMPPHP to upstream version
darcs-hash:20081211181500-5ed1f-5042b1ff2ed5de36500200f3ea2aa91108f1f853.gz
Diffstat (limited to 'extlib/XMPPHP/XMLObj.php')
| -rw-r--r-- | extlib/XMPPHP/XMLObj.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/extlib/XMPPHP/XMLObj.php b/extlib/XMPPHP/XMLObj.php index 79fef9b24..0d3e21991 100644 --- a/extlib/XMPPHP/XMLObj.php +++ b/extlib/XMPPHP/XMLObj.php @@ -22,6 +22,7 @@ * @package XMPPHP * @author Nathanael C. Fritz <JID: fritzy@netflint.net> * @author Stephan Wentz <JID: stephan@jabber.wentz.it> + * @author Michael Garvin <JID: gar@netflint.net> * @copyright 2008 Nathanael C. Fritz */ @@ -32,6 +33,7 @@ * @package XMPPHP * @author Nathanael C. Fritz <JID: fritzy@netflint.net> * @author Stephan Wentz <JID: stephan@jabber.wentz.it> + * @author Michael Garvin <JID: gar@netflint.net> * @copyright 2008 Nathanael C. Fritz * @version $Id$ */ @@ -131,9 +133,9 @@ class XMPPHP_XMLObj { * @param string $name * @return boolean */ - public function hasSub($name) { + public function hasSub($name, $ns = null) { foreach($this->subs as $sub) { - if($sub->name == $name) return true; + if(($name == "*" or $sub->name == $name) and ($ns == null or $sub->ns == $ns)) return true; } return false; } @@ -146,8 +148,9 @@ class XMPPHP_XMLObj { * @param string $ns */ public function sub($name, $attrs = null, $ns = null) { + #TODO attrs is ignored foreach($this->subs as $sub) { - if($sub->name == $name) { + if($sub->name == $name and ($ns == null or $sub->ns == $ns)) { return $sub; } } |