From 5086fb56e64596725e15294870078fd05c027db8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Fri, 28 Dec 2018 22:45:51 +0100
Subject: [PATCH] Update functions.js

---
 server/handlers/functions.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/handlers/functions.js b/server/handlers/functions.js
index e090ec3f..7a831952 100644
--- a/server/handlers/functions.js
+++ b/server/handlers/functions.js
@@ -21,6 +21,7 @@ function encodeChannelName(str) {
     str = filter.clean(str);
     var toReturn = _fn(str);
     toReturn = toReturn.replace(/_/g, "%5F");
+    toReturn = toReturn.replace(/'/g, "%27");
     toReturn = toReturn.replace(/%26amp%3B/g, "%26").replace(/%26amp%3b/g, "%26");
     toReturn = toReturn.toLowerCase();
     return toReturn;
@@ -29,7 +30,7 @@ function encodeChannelName(str) {
 function decodeChannelName(str) {
     var _fn = decodeURIComponent;
     str = str.toUpperCase();
-    var toReturn = _fn(str.replace(/%5F/g, "_"));
+    var toReturn = _fn(str.replace(/%5F/g, "_").replace(/%27/g, "'"));
     toReturn = filter.clean(toReturn);
     return toReturn.toLowerCase();
 }