com php-src: Reverted change to function name and added note of why it is different from the class it is actually changing.: ext/pdo/pdo _stmt.c
| From: | Dmitry Stogov | Date: | Sun, 15 Mar 2015 18:03:08 +0000 |
| Subject: | com php-src: Reverted change to function name and added note of why it is different from the class it is actually changing.: ext/pdo/pdo _stmt.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86000@lists.php.net to get a copy of this message | ||
Commit: 6b232643e5c3b8f20a968e040b7c75695608a15b
Author: Danack <Danack@basereality.com> Sun, 15 Mar 2015 18:03:08 +0000
Parents: 9803fccfbc1022e29dc89d04fcd3618ddf0c60ec
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6b232643e5c3b8f20a968e040b7c75695608a15b
Log:
Reverted change to function name and added note of why it is different from the class it is actually
changing.
Changed paths:
M ext/pdo/pdo_stmt.c
Diff:
diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c
index 9474287..ace8658 100644
--- a/ext/pdo/pdo_stmt.c
+++ b/ext/pdo/pdo_stmt.c
@@ -113,9 +113,9 @@ ZEND_END_ARG_INFO()
RETURN_FALSE; \
} \
-static PHP_FUNCTION(dbrow_constructor) /* {{{ */
+//The class is called PDORow in userland, it is called PDOStatement in the manual.
+static PHP_FUNCTION(dbstmt_constructor) /* {{{ */
{
-// php_error_docref(NULL, E_ERROR, "You should not create a PDOStatement manually");
zend_throw_exception_ex(php_pdo_get_exception(), 0, "You may not create a PDORow
manually");
}
/* }}} */
@@ -2641,7 +2641,8 @@ static union _zend_function *row_get_ctor(zend_object *object)
ctor.type = ZEND_INTERNAL_FUNCTION;
ctor.function_name = zend_string_init("__construct", sizeof("__construct") -
1, 0);
ctor.scope = pdo_row_ce;
- ctor.handler = ZEND_FN(dbrow_constructor);
+ //The class is called PDORow in userland, it is called PDOStatement in the manual.
+ ctor.handler = ZEND_FN(dbstmt_constructor);
ctor.fn_flags = ZEND_ACC_PUBLIC;
return (union _zend_function*)&ctor;