Show
Ignore:
Timestamp:
09/25/08 15:02:12 (4 months ago)
Author:
felix
Message:

Merged revisions 2942,2944 via svnmerge from
http://svn.agavi.org/branches/1.0

........

r2942 | david | 2008-09-24 17:45:36 +0200 (Wed, 24 Sep 2008) | 1 line


Fixed #865: AgaviXmlConfigDomElement::hasChild() does not pass on $namespaceUri argument

........

r2944 | david | 2008-09-24 17:54:58 +0200 (Wed, 24 Sep 2008) | 1 line


merge [2932:2943/branches/0.11]

........

Location:
branches/felix-testing-implementation
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • branches/felix-testing-implementation

    • Property svnmerge-integrated changed from /branches/1.0:1-2892,2894-2932 /branches/dominik-validation-argument-sources:1-2901 to /branches/1.0:1-2892,2894-2944 /branches/dominik-validation-argument-sources:1-2901

  • branches/felix-testing-implementation/src/config/util/dom/AgaviXmlConfigDomElement.class.php

    r2882 r2946  
    161161   * 
    162162   * @author     Noah Fontes <noah.fontes@bitextender.com> 
     163   * @author     David Zülke <david.zuelke@bitextender.com> 
    163164   * @since      1.0.0 
    164165   */ 
    … …  
    166167  { 
    167168    // if namespace uri is null, use default ns. if empty string, use no ns 
    168     return $this->countChildren($name) === 1; 
     169    return $this->countChildren($name, $namespaceUri) === 1; 
    169170     
    170171    // XXX: not necessary for single elements?