revert a86eeac0ab678ea55307e1386c5f955f77d8ff73

diff --git a/application/controllers/IdxController.php b/application/controllers/IdxController.php
index 3996fa04e8e6c5c4adfc7de65293b0627c382cbf..ee1efb06d291453c9dccc14647efc81eb5efbba3 100644 (file)
--- a/application/controllers/IdxController.php
+++ b/application/controllers/IdxController.php
@@ -66,8 +66,7 @@ class IdxController extends Zend_Controller_Action
             $geomform->geom_title->setValue($path->title);
         } else {
             $geomform->setAction('path');
-            $clientip = trim(end(split(',', $this->getRequest()->getClientIp(true))));
-            $extent = new phptojs\JsObject('gMaxExtent', $this->_helper->syjGeoip($clientip));
+            $extent = new phptojs\JsObject('gMaxExtent', $this->_helper->syjGeoip($this->getRequest()->getClientIp(true)));
             $this->view->headScript()->prependScript((string) $extent);
             $title = "Show your journey";
         }

diff --git a/application/controllers/PathController.php b/application/controllers/PathController.php
index 48a22befd43930ef1d0f6a8036e28524c1ea347d..bb969e82c8ed6b15888a6cf9de01adc0510c7a4e 100644 (file)
--- a/application/controllers/PathController.php
+++ b/application/controllers/PathController.php
@@ -13,7 +13,7 @@ class PathController extends Zend_Controller_Action
             throw new Syj_Exception_Request();
         }
         $path->creator = $user;
-        $path->creatorIp = trim(end(split(',', $this->getRequest()->getClientIp(true))));
+        $path->creatorIp = $this->getRequest()->getClientIp(true);
 
         $this->save($path, $formData);
         $data = array('redirect' => "idx/" . (string)$path->id);