D262.id648.diff
No OneTemporary
Actions

Subscribers

None

File Metadata

	Index: branches/5.2.x/core/kernel/db/db_connection.php
	===================================================================
	--- branches/5.2.x/core/kernel/db/db_connection.php
	+++ branches/5.2.x/core/kernel/db/db_connection.php
	@@ -1082,7 +1082,19 @@

	// set 2nd checkpoint: begin
	if ( $this->_profileSQLs ) {
	- $first_cell = count($ret) == 1 && $ret->fieldCount() == 1 ? current($ret->current()) : null;
	+ $current_row = $ret->current();
	+
	+ if ( count($ret) == 1 && $ret->fieldCount() == 1 ) {
	+ if ( is_array($current_row) ) {
	+ $first_cell = current($current_row);
	+ }
	+ else {
	+ $first_cell = $current_row;
	+ }
	+ }
	+ else {
	+ $first_cell = null;
	+ }

	if ( strlen($first_cell) > 200 ) {
	$first_cell = substr($first_cell, 0, 50) . ' ...';