]> granicus.if.org Git - php/commitdiff
tidy_repair_string() should not try to load config file if there was no config parameter
authorAntony Dovgal <tony2001@php.net>
Thu, 30 Dec 2004 11:56:18 +0000 (11:56 +0000)
committerAntony Dovgal <tony2001@php.net>
Thu, 30 Dec 2004 11:56:18 +0000 (11:56 +0000)
ext/tidy/tidy.c

index 4fc6480d847b06b2e09463cdf18b8cb5dba77428..75a2b6e1645fe67236cda72d4a1a42f4add02182 100644 (file)
@@ -429,14 +429,16 @@ static void php_tidy_quick_repair(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_fil
        
        /* We can't use TIDY_APPLY_CONFIG_ZVAL() here, it uses RETURN_FALSE */
 
-       if(Z_TYPE_P(config) == IS_ARRAY) {
-               _php_tidy_apply_config_array(doc, HASH_OF(config) TSRMLS_CC);
-       } else {
-               convert_to_string_ex(&config);
-               TIDY_SAFE_MODE_CHECK(Z_STRVAL_P(config));
-               if (tidyLoadConfig(doc, Z_STRVAL_P(config)) < 0) {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not load configuration file '%s'", Z_STRVAL_P(config));
-                       RETVAL_FALSE;
+       if (ZEND_NUM_ARGS() > 1) {
+               if(Z_TYPE_P(config) == IS_ARRAY) {
+                       _php_tidy_apply_config_array(doc, HASH_OF(config) TSRMLS_CC);
+               } else {
+                       convert_to_string_ex(&config);
+                       TIDY_SAFE_MODE_CHECK(Z_STRVAL_P(config));
+                       if (tidyLoadConfig(doc, Z_STRVAL_P(config)) < 0) {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not load configuration file '%s'", Z_STRVAL_P(config));
+                               RETVAL_FALSE;
+                       }
                }
        }