From 930be112dcddd4604eae9450522fdafa9438890a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 7 Oct 2014 07:22:05 +0200 Subject: php-doctrine-orm: 2.4.6 --- php-doctrine-orm-upstream.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'php-doctrine-orm-upstream.patch') diff --git a/php-doctrine-orm-upstream.patch b/php-doctrine-orm-upstream.patch index c8d6170..b2dff4c 100644 --- a/php-doctrine-orm-upstream.patch +++ b/php-doctrine-orm-upstream.patch @@ -49,7 +49,7 @@ index 5d36f64..f8b4bb7 100644 public function newInstance() { - if ($this->_prototype === null) { -- if (PHP_VERSION_ID === 50429 || PHP_VERSION_ID === 50513) { +- if (PHP_VERSION_ID === 50429 || PHP_VERSION_ID === 50513 || PHP_VERSION_ID >= 50600) { - $this->_prototype = $this->reflClass->newInstanceWithoutConstructor(); - } else { - $this->_prototype = unserialize(sprintf('O:%d:"%s":0:{}', strlen($this->name), $this->name)); -- cgit