From: Xinchen Hui <laruence@php.net>
Date: Tue, 7 Jul 2015 13:38:24 +0000 (+0800)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: php-7.0.0beta1~12^2~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ca1ba39102d3e209d4c8a04b46316e9c8b7521e4;p=php

Merge branch 'PHP-5.6'

Conflicts:
	ext/sqlite3/sqlite3.c
---

ca1ba39102d3e209d4c8a04b46316e9c8b7521e4
diff --cc ext/sqlite3/sqlite3.c
index eacd66399e,16319a7341..b16cba3668
--- a/ext/sqlite3/sqlite3.c
+++ b/ext/sqlite3/sqlite3.c
@@@ -299,7 -309,11 +303,11 @@@ PHP_METHOD(sqlite3, lastErrorMsg
  		return;
  	}
  
- 	RETVAL_STRING((char *)sqlite3_errmsg(db_obj->db));
+ 	if (db_obj->initialised) {
 -		RETURN_STRING((char *)sqlite3_errmsg(db_obj->db), 1);
++		RETURN_STRING((char *)sqlite3_errmsg(db_obj->db));
+ 	} else {
+ 		RETURN_EMPTY_STRING();
+ 	}
  }
  /* }}} */