Merge branch '1.0' into 2.0

This commit is contained in:
terrafrost 2017-03-01 22:27:00 -06:00
commit ecb92ad25c

View File

@ -3879,7 +3879,6 @@ class SSH2
switch (NET_SSH2_LOGGING) {
case self::LOG_SIMPLE:
return $this->message_number_log;
break;
case self::LOG_COMPLEX:
$log = $this->_format_log($this->message_log, $this->message_number_log);
return PHP_SAPI == 'cli' ? $log : '<pre>' . $log . '</pre>';