From 3dde120cde9e046c9c23ff209369ef60437c57aa Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Mon, 16 Apr 2012 14:49:34 +0530
Subject: [PATCH] merge

---
 js/core.min.js  | 2 +-
 js/wn/router.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/core.min.js b/js/core.min.js
index bebd745ceb..513d738d85 100644
--- a/js/core.min.js
+++ b/js/core.min.js
@@ -103,7 +103,7 @@ wn.route=function(){wn._cur_route=window.location.hash;route=wn.get_route();swit
 wn.views.formview.show(route[1],route[2]);break;case"Report":wn.views.reportview.show(route[1],route[2]);break;default:wn.views.pageview.show(route[0]);}}
 wn.get_route=function(route){if(!route)
 route=window.location.hash;if(route.substr(0,1)=='#')route=route.substr(1);if(route.substr(0,1)=='!')route=route.substr(1);return $.map(route.split('/'),function(r){return decodeURIComponent(r);});}
-wn.set_route=function(){route=$.map(arguments,function(a){return encodeURIComponent(a)}).join('/');window.location.hash=route;set_favicon();}
+wn.set_route=function(){route=$.map(arguments,function(a){return encodeURIComponent(a)}).join('/');window.location.hash=route;wn.app.set_favicon();}
 wn._cur_route=null;$(window).bind('hashchange',function(){if(location.hash==wn._cur_route)
 return;wn.route();if(wn.boot.analytics_code){try{eval(wn.boot.analytics_code);}catch(e){console.log(e);}}});
 /*
diff --git a/js/wn/router.js b/js/wn/router.js
index 6f31dc1b8c..0830f59212 100644
--- a/js/wn/router.js
+++ b/js/wn/router.js
@@ -37,7 +37,7 @@ wn.set_route = function() {
 	window.location.hash = route;
 	
 	// Set favicon (app.js)
-	set_favicon();
+	wn.app.set_favicon();
 }
 
 wn._cur_route = null;