Merge branch 'master' of github.com:designcreateplay/NodeBB

public/src/app.js

@@ -234,13 +234,13 @@ var socket,
 			parts = url.split('/'),
 			active = parts[parts.length-1];
 
-		jQuery('.nav li').removeClass('active');
+		jQuery('#main-nav li').removeClass('active');
 		if(active) {
-			jQuery('.nav li a').each(function() {
+			jQuery('#main-nav li a').each(function() {
 				var href = this.getAttribute('href');
 				if(active.match(/^users/))
 					active = 'users';
-				if (href.match(active)) {
+				if (href && href.match(active)) {
 					jQuery(this.parentNode).addClass('active');
 					return false;
 				}

public/templates/header.tpl

@@ -45,7 +45,7 @@
 					<span class="icon-bar"></span>
 				</button>
 				<div class="nav-collapse collapse">
-					<ul class="nav nodebb-inline-block">
+					<ul id="main-nav" class="nav nodebb-inline-block">
 						<li>
 							<a href="/recent">Recent <!--<span class="badge badge-inverse">3</span>--></a>
 						</li>