diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2009-03-22 15:05:20 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2009-03-22 15:05:20 +0000 |
| commit | 03a27e33732dfdadac4611b3758124db78a784b7 (patch) | |
| tree | 26e25714406a63a9d509c72401e5541702601878 /ext/sqlite/sqlite.c | |
| parent | caf9054e3dd8385435b10914045aaf7a89408487 (diff) | |
| download | php-git-03a27e33732dfdadac4611b3758124db78a784b7.tar.gz | |
Improved parameter parsing
Diffstat (limited to 'ext/sqlite/sqlite.c')
| -rw-r--r-- | ext/sqlite/sqlite.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/sqlite/sqlite.c b/ext/sqlite/sqlite.c index 9307145eaf..f1f8f60a27 100644 --- a/ext/sqlite/sqlite.c +++ b/ext/sqlite/sqlite.c @@ -2357,7 +2357,7 @@ PHP_FUNCTION(sqlite_fetch_object) zend_bool decode_binary = 1; struct php_sqlite_result *res; zval *object = getThis(); - char *class_name; + char *class_name = NULL; int class_name_len; zend_class_entry *ce; zval dataset; @@ -2374,7 +2374,7 @@ PHP_FUNCTION(sqlite_fetch_object) return; } RES_FROM_OBJECT_RESTORE_ERH(res, object, &error_handling); - if (!ZEND_NUM_ARGS()) { + if (!class_name) { ce = zend_standard_class_def; } else { ce = zend_fetch_class(class_name, class_name_len, ZEND_FETCH_CLASS_AUTO TSRMLS_CC); @@ -2385,7 +2385,7 @@ PHP_FUNCTION(sqlite_fetch_object) return; } ZEND_FETCH_RESOURCE(res, struct php_sqlite_result *, &zres, -1, "sqlite result", le_sqlite_result); - if (ZEND_NUM_ARGS() < 2) { + if (!class_name) { ce = zend_standard_class_def; } else { ce = zend_fetch_class(class_name, class_name_len, ZEND_FETCH_CLASS_AUTO TSRMLS_CC); |