merge framework

This commit is contained in:
oliver 2015-08-10 20:30:58 +02:00
commit 4dca3e8089
2 changed files with 3 additions and 4 deletions

View file

@ -98,9 +98,8 @@
} }
/** /**
* Load the Models of this Controller. * Load the Models of this Component.
* *
* @throws \nre\exceptions\DriverNotFoundException * @throws \nre\exceptions\DriverNotFoundException
* @throws \nre\exceptions\DriverNotValidException * @throws \nre\exceptions\DriverNotValidException

View file

@ -64,7 +64,7 @@
* @param string $message Message to log * @param string $message Message to log
* @param int $logMode Log mode to use * @param int $logMode Log mode to use
*/ */
public function log($message, $logMode=self::LOGMODE_SCREEN) public function log($message, $logMode=self::LOGMODE_AUTO)
{ {
// Choose log mode automatically // Choose log mode automatically
if($logMode == self::LOGMODE_AUTO) { if($logMode == self::LOGMODE_AUTO) {
@ -135,7 +135,7 @@
*/ */
private function isLocalhost() private function isLocalhost()
{ {
return ($_SERVER['SERVER_ADDR'] == '127.0.0.1' || $_SERVER['SERVER_ADDR'] = '::1'); return (strpos($_SERVER['HTTP_HOST'], '.') === false);
} }
} }