cvs: php-src(PHP_5_2) / NEWS /ext/pdo pdo_dbh.c

johannes Tue Sep 16 23:37:35 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/pdo pdo_dbh.c /php-src NEWS Log: MFH Fix #44424 (Extending PDO/MySQL class with a __call() function doesn't work) http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.82.2.31.2.22&r2=1.82.2.31.2.23&diff_format=u Index: php-src/ext/pdo/pdo_dbh.c diff -u php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.22 php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.23 --- php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.22 Mon Mar 3 21:14:33 2008 +++ php-src/ext/pdo/pdo_dbh.c Tue Sep 16 23:37:35 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo_dbh.c,v 1.82.2.31.2.22 2008/03/03 21:14:33 iliaa Exp $ */ +/* $Id: pdo_dbh.c,v 1.82.2.31.2.23 2008/09/16 23:37:35 johannes Exp $ */ /* The PDO Database Handle Class */ @@ -1291,9 +1291,7 @@ if (zend_hash_find(dbh->cls_methods[PDO_DBH_DRIVER_METHOD_KIND_DBH], lc_method_name, method_len+1, (void**)&fbc) == FAILURE) { - if (std_object_handlers.get_method) { - fbc = std_object_handlers.get_method(object_pp, lc_method_name, method_len TSRMLS_CC); - } + if (!fbc) { fbc = NULL; } @@ -1304,6 +1302,12 @@ } out: + if (!fbc) { + if (std_object_handlers.get_method) { + fbc = std_object_handlers.get_method(object_pp, lc_method_name, method_len TSRMLS_CC); + } + } + efree(lc_method_name); return fbc; } http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1227&r2=1.2027.2.547.2.1228&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1227 php-src/NEWS:1.2027.2.547.2.1228 --- php-src/NEWS:1.2027.2.547.2.1227 Mon Sep 15 11:47:02 2008 +++ php-src/NEWS Tue Sep 16 23:37:35 2008 @@ -102,6 +102,8 @@ (Hannes) - Fixed bug #44617 (wrong HTML entity output when substitute_character=entity). (Moriyoshi) +- Fixed bug #44425 (Extending PDO/MySQL class with a __call() function doesn't + work). (Johannes) - Fixed bug #44246 (closedir() accepts a file resource opened by fopen()). (Dmitry, Tony) - Fixed bug #44127 (UNIX abstract namespace socket connect does not work).