Changeset 2946

Show
Ignore:
Timestamp:
09/25/08 15:02:12 (8 weeks 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:
5 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/CHANGELOG

    r2933 r2946  
    11AGAVI CHANGELOG 
    22=============== 
     3 
     41.0.0 beta 4 (October ??, 2008) 
     5------------------------------- 
     6 
     7FIX: AgaviXmlConfigDomElement::hasChild() does not pass on $namespaceUri argument (#865) (David) 
     8 
    39 
    4101.0.0 beta 3 (September 21, 2008) 
    … …  
    7480------------------------------- 
    7581 
     82FIX: SOAP and XMLRPC test scripts in sample app are broken (#866) (David) 
    7683FIX: Certain validator names will cause a fatal error (#863) (David) 
    7784FIX: Sample app SearchEngineSpamAction works with invalid product names (#861) (David) 

  • branches/felix-testing-implementation/samples/pub/soap-test.php

    r2028 r2946  
    1010 
    1111if(!isset($_GET['item'])) { 
    12   $_GET['item'] = 'nonsense'; 
     12  $_GET['item'] = 123456; 
    1313} 
    1414 

  • branches/felix-testing-implementation/samples/pub/xmlrpc-test.php

    r1964 r2946  
    88    <h1>Agavi XML-RPC Test</h1> 
    99<?php 
    10 $request = xmlrpc_encode_request('getItemPrice', array('name' => 'nonsense'), array("encoding" => "utf-8", "escaping" => "markup")); 
     10$request = xmlrpc_encode_request('getItemPrice', array('id' => 123456), array("encoding" => "utf-8", "escaping" => "markup")); 
    1111 
    1212$url = "http://localhost/~dzuelke/_projects/agavi/branches/0.11/samples/pub/xmlrpc.php"; 

  • 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?