diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2020-09-30 08:37:43 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2020-09-30 08:37:43 +0300 |
| commit | 5f249992375f8ce192871282f1ca8def109201d4 (patch) | |
| tree | 0c31fc8128b098e1b98977deaf146e6de168a891 | |
| parent | b94fd3a3b68d0fcc9dbd9275656925c8cf722d0d (diff) | |
| parent | 2a0e4b88fdeb599673220ca39499337123aa5514 (diff) | |
| download | php-git-5f249992375f8ce192871282f1ca8def109201d4.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed incorrect error message
| -rw-r--r-- | ext/soap/php_schema.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/ext/soap/php_schema.c b/ext/soap/php_schema.c index fc80b4a79c..c9ee033b14 100644 --- a/ext/soap/php_schema.c +++ b/ext/soap/php_schema.c @@ -1612,8 +1612,6 @@ static int schema_element(sdlPtr sdl, xmlAttrPtr tns, xmlNodePtr element, sdlTyp attr = get_attribute(attrs, "default"); if (attr) { if (ref != NULL) { - soap_error0(E_ERROR, "Parsing Schema: element has both 'ref' and 'fixed' attributes"); - } else if (ref != NULL) { soap_error0(E_ERROR, "Parsing Schema: element has both 'default' and 'fixed' attributes"); } cur_type->def = estrdup((char*)attr->children->content); |