Merge branch '45-sameHost'

cdevroe · Mar 26, 2014 · 83bcaef · 83bcaef
2 parents 99f35a0 + d18c420
commit 83bcaef
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/application/core/Plain_Controller.php b/application/core/Plain_Controller.php
@@ -355,7 +355,8 @@ protected function isSameHost()
         // Going to execute this better, need to think about it
         $host   = (isset($_SERVER['HTTP_HOST'])) ? strtolower($_SERVER['HTTP_HOST']) : null;
         $origin = (isset($_SERVER['HTTP_REFERER'])) ? strtolower(parse_url($_SERVER['HTTP_REFERER'], PHP_URL_HOST)) : null;
-        return (! empty($origin) && ! empty($host) && $host == $origin) ? true : false;
+        $port   = (isset($_SERVER['SERVER_PORT']) && ! empty($_SERVER['SERVER_PORT'])) ? ':' . $_SERVER['SERVER_PORT'] : null;
+        return (! empty($origin) && ! empty($host) && ($host == $origin || $host == $origin . $port)) ? true : false;
     }
 
     public function isWebView()