Skip to content

Commit 04420b2

Browse files
authored
Merge pull request #3 from freestream/fix/directaccess-frontnames
Do not redirect direct access front-names
2 parents 5859d85 + aa9f6ad commit 04420b2

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

app/code/community/Webbhuset/Geoip/Model/Observer.php

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,15 @@ public function redirectStore(Varien_Event_Observer $observer)
2626
return;
2727
}
2828

29+
$request = Mage::app()->getRequest();
30+
$routeName = $request->getRouteName();
31+
$route = Mage::app()->getFrontController()->getRouterByRoute($routeName);
32+
$frontName = $route->getFrontNameByRoute($routeName);
33+
34+
if ($request->isDirectAccessFrontendName($frontName)) {
35+
return;
36+
}
37+
2938
$this->checkNoRoute();
3039

3140
$geoIP = Mage::getSingleton('geoip/country');
@@ -34,7 +43,6 @@ public function redirectStore(Varien_Event_Observer $observer)
3443
$session = Mage::getSingleton('core/session');
3544
$result = new Varien_Object(array('should_proceed' => 1));
3645

37-
3846
Mage::dispatchEvent('wh_geoip_redirect_store_before', array('result' => $result));
3947

4048
if (

0 commit comments

Comments
 (0)