From af2289206ffd67e5fe99b04ceeb9130e714cd520 Mon Sep 17 00:00:00 2001
From: Topsitemakers <support@topsitemakers.com>
Date: Mon, 17 Mar 2014 19:03:43 +0100
Subject: [PATCH] Fixing the issue with breadcrumbs and subfolders; including
 the link to dashboard by default on all non-dashboard pages.

---
 app/libraries/utils.php |  4 ++++
 app/routes.php          | 10 +++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/libraries/utils.php b/app/libraries/utils.php
index e636682a9843..88d87cd4650b 100755
--- a/app/libraries/utils.php
+++ b/app/libraries/utils.php
@@ -2,6 +2,10 @@
 
 class Utils
 {
+	public static function basePath() {
+		return substr($_SERVER['SCRIPT_NAME'], 0, strrpos($_SERVER['SCRIPT_NAME'], '/') + 1);
+	}
+	
 	public static function fatalError($message = false, $exception = false)
 	{
 		if (!$message)
diff --git a/app/routes.php b/app/routes.php
index 329213dec6da..09ccac47185a 100755
--- a/app/routes.php
+++ b/app/routes.php
@@ -163,8 +163,16 @@ HTML::macro('image_data', function($imagePath) {
 
 HTML::macro('breadcrumbs', function() {
   $str = '<ol class="breadcrumb">';
-  $crumbs = explode('/', $_SERVER['REQUEST_URI']);  
 
+  // Get the breadcrumbs by exploding the current path.
+  $crumbs = explode('/', str_replace(Utils::basePath(), '', $_SERVER['REQUEST_URI']));
+
+  // Include the link to Dashboard by default only if the user is not on the
+  // dashboard page.
+  if (!Request::is('dashboard')) {
+    $str .= '<li>' . link_to('dashboard', 'Dashboard') . '</li>';
+  }
+  
   foreach ($crumbs as $key => $val)
   {
     if (is_numeric($val))