From 1fbff2b767bdf8c25d9064d9985ea0da40d6c6c9 Mon Sep 17 00:00:00 2001
From: Pereira Ricardo <hello@nunopress.com>
Date: Sun, 11 Jan 2015 18:33:45 +0100
Subject: [PATCH] Fixed route and blueprints locator stream.

---
 admin.php              | 4 ++--
 classes/admin.php      | 2 +-
 classes/popularity.php | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/admin.php b/admin.php
index 43bdfa16..21185760 100644
--- a/admin.php
+++ b/admin.php
@@ -144,8 +144,8 @@ class AdminPlugin extends Plugin
         $this->grav['admin']->routes = $pages->routes();
 
         // Remove default route from routes.
-        if (isset($this->grav['admin']->routes[$this->grav['config']->get('system.home.alias')])) {
-            unset($this->grav['admin']->routes[$this->grav['config']->get('system.home.alias')]);
+        if (isset($this->grav['admin']->routes['/'])) {
+            unset($this->grav['admin']->routes['/']);
         }
 
         $pages->dispatch('/', true)->route($home);
diff --git a/classes/admin.php b/classes/admin.php
index d3ecc1ce..6209ae42 100644
--- a/classes/admin.php
+++ b/classes/admin.php
@@ -198,7 +198,7 @@ class Admin
     public function blueprints($type)
     {
         if ($this->blueprints === null) {
-            $this->blueprints = new Data\Blueprints(ROOT_DIR . 'system/blueprints/');
+            $this->blueprints = new Data\Blueprints($this->grav['locator']->findResource('blueprints://'));
         }
         return $this->blueprints->get($type);
     }
diff --git a/classes/popularity.php b/classes/popularity.php
index cdfc8920..ab840317 100644
--- a/classes/popularity.php
+++ b/classes/popularity.php
@@ -38,7 +38,7 @@ class Popularity
     {
         $this->config = self::$grav['config'];
 
-        $this->data_path = LOG_DIR . 'popularity';
+        $this->data_path = self::$grav['locator']->findResource('log://') . 'popularity';
         $this->daily_file = $this->data_path.'/'.self::DAILY_FILE;
         $this->monthly_file = $this->data_path.'/'.self::MONTHLY_FILE;
         $this->totals_file = $this->data_path.'/'.self::TOTALS_FILE;