- fixed bug Ethna_Session::start emits E_NOTICE in CLI environment.

diff --git a/CHANGES b/CHANGES
index 26e38a5..c897185 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -56,6 +56,7 @@
 - 存在しない(or 削除された) ethnaコマンドを指定すると Fatal Error が起きるバグを修正 (thanks:kondo_)
 -- http://sourceforge.jp/ticket/browse.php?group_id=1343&tid=17894
 - Ethna_Plugin_Logwriter の debug_backtrace の一部が取得できず、E_NOTICE が出るバグを修正 (thanks: http://www.remix.gr.jp/)
+- cli 環境で Ethna_Session::start を叩いたときに $_SERVER 変数がないために E_NOTICE が出る問題を修正
 
 ** 2.5.0-preview4
 

diff --git a/class/Ethna_Session.php b/class/Ethna_Session.php
index e6c546d..1eca58a 100644 (file)
--- a/class/Ethna_Session.php
+++ b/class/Ethna_Session.php
@@ -157,7 +157,7 @@ class Ethna_Session
         session_set_cookie_params($lifetime);
         session_id(Ethna_Util::getRandom());
         session_start();
-        $_SESSION['REMOTE_ADDR'] = $_SERVER['REMOTE_ADDR'];
+        $_SESSION['REMOTE_ADDR'] = isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR']: false;
         $_SESSION['__anonymous__'] = $anonymous;
         $this->anonymous = $anonymous;
         $this->session_start = true;