Merge branch '2.0'

This commit is contained in:
terrafrost 2017-03-01 22:27:31 -06:00
commit 9cbf357ac5

View File

@ -3873,10 +3873,9 @@ class SSH2
switch (NET_SSH2_LOGGING) {
case self::LOG_SIMPLE:
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;
}