Moved root route logit to parse_request() method

alterfw · Aug 18, 2015 · 1a429f8 · 1a429f8
1 parent 94ebf10
commit 1a429f8
Showing 1 changed file with 13 additions and 14 deletions.
diff --git a/src/router.php b/src/router.php
@@ -60,20 +60,6 @@ private function __construct(){
     $this->registerFilters();
   }
 
-  public function __destruct() {
-
-    if($this->getEnv() == 'WP') {
-      $url = "http" . (($_SERVER['SERVER_PORT'] == 443) ? "s://" : "://") . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
-      if($this->root && str_replace($this->base, '', $url) == '/'){
-        $route = $this->getRoute($this->root);
-        $this->getCallback($route, []);
-        Ampersand::getInstance()->run();
-        $this->end();
-      }
-    }
-
-  }
-
   public function setRoutes($r) {
     $this->routes = $r;
   }
@@ -292,6 +278,7 @@ public function rewrite_url( $wp_rewrite ) {
   public function parse_request($wp_query) {
 
     if (isset($wp_query->query_vars['amp_route'])){
+
       $route = $this->getRoute($wp_query->query_vars['amp_route']);
       if($route['id'] == $wp_query->query_vars['amp_route'] && $route['method'] == $_SERVER['REQUEST_METHOD']){
         $this->getCallback($route, $wp_query->query_vars);
@@ -303,7 +290,19 @@ public function parse_request($wp_query) {
       Ampersand::getInstance()->run();
       $this->end();
 
+    } else {
+
+      if($this->getEnv() == 'WP') {
+        $url = "http" . (($_SERVER['SERVER_PORT'] == 443) ? "s://" : "://") . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+        if($this->root && str_replace($this->base, '', $url) == '/'){
+          $route = $this->getRoute($this->root);
+          $this->getCallback($route, []);
+          Ampersand::getInstance()->run();
+        }
+      }      
+
     }
+
   }
 
 }