From: Marcus Boerger <helly@php.net>
Date: Fri, 24 Feb 2006 16:04:13 +0000 (+0000)
Subject: - s/FETCH_PROPSLATE/FETCH_PROPS_LATE/ as per IRC discussion
X-Git-Tag: RELEASE_1_2~91
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e610f5959fd5a23a7f1bc3f2a110cd377e40d4bc;p=php

- s/FETCH_PROPSLATE/FETCH_PROPS_LATE/ as per IRC discussion
---

diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c
index e9ff63e48a..b1a7947e49 100755
--- a/ext/pdo/pdo_dbh.c
+++ b/ext/pdo/pdo_dbh.c
@@ -1238,7 +1238,7 @@ void pdo_dbh_init(TSRMLS_D)
 #if PHP_MAJOR_VERSION > 5 || PHP_MINOR_VERSION >= 1
 	REGISTER_PDO_CLASS_CONST_LONG("FETCH_SERIALIZE",(long)PDO_FETCH_SERIALIZE);
 #endif
-	REGISTER_PDO_CLASS_CONST_LONG("FETCH_PROPSLATE",(long)PDO_FETCH_PROPSLATE);
+	REGISTER_PDO_CLASS_CONST_LONG("FETCH_PROPS_LATE",(long)PDO_FETCH_PROPS_LATE);
 	REGISTER_PDO_CLASS_CONST_LONG("FETCH_NAMED",(long)PDO_FETCH_NAMED);
 
 	REGISTER_PDO_CLASS_CONST_LONG("ATTR_AUTOCOMMIT",	(long)PDO_ATTR_AUTOCOMMIT);
diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c
index 9a122d294c..36eb6128d8 100755
--- a/ext/pdo/pdo_stmt.c
+++ b/ext/pdo/pdo_stmt.c
@@ -838,7 +838,7 @@ static int do_fetch(pdo_stmt_t *stmt, int do_bind, zval *return_value,
 							return 0;
 						}
 					}
-					if (ce->constructor && (flags & PDO_FETCH_PROPSLATE)) {
+					if (ce->constructor && (flags & PDO_FETCH_PROPS_LATE)) {
 						stmt->fetch.cls.fci.object_pp = &return_value;
 						stmt->fetch.cls.fcc.object_pp = &return_value;
 						if (zend_call_function(&stmt->fetch.cls.fci, &stmt->fetch.cls.fcc TSRMLS_CC) == FAILURE) {
@@ -1012,7 +1012,7 @@ static int do_fetch(pdo_stmt_t *stmt, int do_bind, zval *return_value,
 		
 		switch (how) {
 			case PDO_FETCH_CLASS:
-				if (ce->constructor && !(flags & PDO_FETCH_PROPSLATE)) {
+				if (ce->constructor && !(flags & PDO_FETCH_PROPS_LATE)) {
 					stmt->fetch.cls.fci.object_pp = &return_value;
 					stmt->fetch.cls.fcc.object_pp = &return_value;
 					if (zend_call_function(&stmt->fetch.cls.fci, &stmt->fetch.cls.fcc TSRMLS_CC) == FAILURE) {
diff --git a/ext/pdo/php_pdo_driver.h b/ext/pdo/php_pdo_driver.h
index 889a355bd6..fd9f10fe2e 100755
--- a/ext/pdo/php_pdo_driver.h
+++ b/ext/pdo/php_pdo_driver.h
@@ -98,7 +98,7 @@ enum pdo_fetch_type {
 #define PDO_FETCH_UNIQUE    0x00030000  /* fetch into groups assuming first col is unique */
 #define PDO_FETCH_CLASSTYPE 0x00040000  /* fetch class gets its class name from 1st column */
 #define PDO_FETCH_SERIALIZE 0x00080000  /* fetch class instances by calling serialize */
-#define PDO_FETCH_PROPSLATE 0x00100000  /* fetch props after calling ctor */
+#define PDO_FETCH_PROPS_LATE 0x00100000  /* fetch props after calling ctor */
 
 /* fetch orientation for scrollable cursors */
 enum pdo_fetch_orientation {
diff --git a/ext/pdo/tests/bug_36428.phpt b/ext/pdo/tests/bug_36428.phpt
index 1aea012c69..6abba6bd7c 100755
--- a/ext/pdo/tests/bug_36428.phpt
+++ b/ext/pdo/tests/bug_36428.phpt
@@ -18,7 +18,7 @@ $db = PDOTest::factory();
 $db->exec("CREATE TABLE test (a VARCHAR(10))");
 $db->exec("INSERT INTO test (a) VALUES ('xyz')");
 $res = $db->query("SELECT a FROM test");
-var_dump($res->fetchAll(PDO::FETCH_CLASS|PDO::FETCH_PROPSLATE, 'SimpleXMLElement', array('<root/>')));
+var_dump($res->fetchAll(PDO::FETCH_CLASS|PDO::FETCH_PROPS_LATE, 'SimpleXMLElement', array('<root/>')));
 
 ?>
 ===DONE===