From 984c18904d71bf33145fe61acbdedbf6a4690caf Mon Sep 17 00:00:00 2001
From: Wikinaut <mail@tgries.de>
Date: Sat, 1 Dec 2012 10:32:48 +0100
Subject: [PATCH] fix 1236 favicon url

---
 src/node/utils/Settings.js | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/node/utils/Settings.js b/src/node/utils/Settings.js
index fb2a592cb..05e4f349a 100644
--- a/src/node/utils/Settings.js
+++ b/src/node/utils/Settings.js
@@ -38,8 +38,6 @@ exports.title = "Etherpad Lite";
  * The app favicon fully specified url, visible e.g. in the browser window
  */
 exports.favicon = "favicon.ico";
-exports.faviconPad = "../" + exports.favicon;
-exports.faviconTimeslider = "../../" + exports.favicon;
 
 /**
  * The IP ep-lite should listen to
@@ -169,6 +167,20 @@ exports.reloadSettings = function reloadSettings() {
     }
   }
 
+  var favicon = exports.favicon;
+  if (favicon.match(/^https?:\/\//i))
+  {
+    settings.faviconPad = favicon;
+    settings.faviconTimeslider = favicon;
+  }else 
+  {
+    settings.faviconPad = "../" + favicon;
+    settings.faviconTimeslider = "../../" + favicon;
+  }
+  exports.faviconPad = settings.faviconPad;
+  exports.faviconTimeslider = settings.faviconTimeslider;
+
+  
   if(exports.dbType === "dirty"){
     console.warn("DirtyDB is used. This is fine for testing but not recommended for production.")
   }