From: Felipe Pena <felipe@php.net>
Date: Tue, 23 Sep 2008 23:10:01 +0000 (+0000)
Subject: - MFH: Fixed bug #46157 (PDOStatement::fetchObject prototype error)
X-Git-Tag: php-5.2.7RC1~26
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eff8a93ded63d83e1810ddd345926d12e64eef4d;p=php

- MFH: Fixed bug #46157 (PDOStatement::fetchObject prototype error)
---

diff --git a/NEWS b/NEWS
index 088ab3502c..68681f8f11 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,7 @@ PHP                                                                        NEWS
   (Scott)
 - Fixed a crash on invalid method in ReflectionParameter constructor.
   (Christian Seiler)
+- Fixed bug #46157 (PDOStatement::fetchObject prototype error). (Felipe)
 - Fixed bug #46147 (after stream seek, appending stream filter reads incorrect data).
   (Greg)
 - Fixed bug #46088 (RegexIterator::accept - segfault). (Felipe)
diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c
index 940fe84567..0bd4298aab 100755
--- a/ext/pdo/pdo_stmt.c
+++ b/ext/pdo/pdo_stmt.c
@@ -46,7 +46,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_pdostatement_fetch, 0, 0, 0)
 	ZEND_ARG_INFO(0, orientation)
 	ZEND_ARG_INFO(0, offset)
 ZEND_END_ARG_INFO()
-ZEND_BEGIN_ARG_INFO_EX(arginfo_pdostatement_fetchobject, 0, 0, 1)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_pdostatement_fetchobject, 0, 0, 0)
 	ZEND_ARG_INFO(0, class_name)
 	ZEND_ARG_INFO(0, ctor_args) /* array */
 ZEND_END_ARG_INFO()
@@ -1365,7 +1365,7 @@ static PHP_METHOD(PDOStatement, fetch)
 }
 /* }}} */
 
-/* {{{ proto mixed PDOStatement::fetchObject(string class_name [, NULL|array ctor_args])
+/* {{{ proto mixed PDOStatement::fetchObject([string class_name [, NULL|array ctor_args]])
    Fetches the next row and returns it as an object. */
 static PHP_METHOD(PDOStatement, fetchObject)
 {