From a61bf9318b3d184d58cb3268cdae545a2cabf719 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Johannes=20Schl=C3=BCter?= <johannes@php.net>
Date: Thu, 11 Feb 2010 21:42:48 +0000
Subject: [PATCH] revert 293939 Fixed bug #50636 (MySQLi_Result sets values
 before calling constructor)

---
 ext/mysqli/mysqli.c            |  3 +--
 ext/mysqli/tests/bug50636.phpt | 35 ----------------------------------
 2 files changed, 1 insertion(+), 37 deletions(-)
 delete mode 100644 ext/mysqli/tests/bug50636.phpt

diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index cf02be36ff..342e3eb78e 100644
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -1236,6 +1236,7 @@ void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flags
 		zval *retval_ptr; 
 
 		object_and_properties_init(return_value, ce, NULL);
+		zend_merge_properties(return_value, Z_ARRVAL(dataset), 1 TSRMLS_CC);
 
 		if (ce->constructor) {
 			fci.size = sizeof(fci);
@@ -1291,8 +1292,6 @@ void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flags
 		} else if (ctor_params) {
 			zend_throw_exception_ex(zend_exception_get_default(TSRMLS_C), 0 TSRMLS_CC, "Class %v does not have a constructor hence you cannot use ctor_params", ce->name);
 		}
-		
-		zend_merge_properties(return_value, Z_ARRVAL(dataset), 1 TSRMLS_CC);
 	}
 }
 /* }}} */
diff --git a/ext/mysqli/tests/bug50636.phpt b/ext/mysqli/tests/bug50636.phpt
deleted file mode 100644
index c2d7fd20a2..0000000000
--- a/ext/mysqli/tests/bug50636.phpt
+++ /dev/null
@@ -1,35 +0,0 @@
---TEST--
-Bug #50636 (MySQLi_Result sets values before calling constructor)
---SKIPIF--
-<?php
-require_once('skipif.inc');
-require_once('skipifconnectfailure.inc');
-?>
---FILE--
-<?php
-	include ("connect.inc");
-
-    class Book {
-        private $title = 0;
-
-        function __construct() {
-            $this->title = 'foobar';
-        }
-
-        function __set($name, $value) {
-            $this->{$name}   = $value;
-        }
-    }
-
-    $link = new mysqli($host, $user, $passwd);
-    var_dump($link->query('SELECT "PHP" AS title, "Rasmus" AS author')->fetch_object('Book'));
-    echo "done!";
-?>
---EXPECTF--
-object(Book)#%d (2) {
-  [%u|b%"title":%u|b%"Book":private]=>
-  %unicode|string%(3) "PHP"
-  [%u|b%"author"]=>
-  %unicode|string%(6) "Rasmus"
-}
-done!
-- 
2.50.1