Merge branch '1.0' into 2.0

This commit is contained in:
terrafrost 2017-03-01 22:24:59 -06:00
commit 9f4f288005

View File

@ -3881,8 +3881,8 @@ class SSH2
return $this->message_number_log;
break;
case self::LOG_COMPLEX:
return $this->_format_log($this->message_log, $this->message_number_log);
break;
$log = $this->_format_log($this->message_log, $this->message_number_log);
return PHP_SAPI == 'cli' ? $log : '<pre>' . $log . '</pre>';
default:
return false;
}