Merge remote-tracking branch 'mike/master' into dev

2018-05-05 10:03:57 +02:00
parent 192b69b11a c6e65ec6da
commit 0895756658
2 changed files with 3 additions and 2 deletions
--- a/boot.php
+++ b/boot.php
@@ -886,7 +886,7 @@ class App {

 		// unix style "homedir"

-		if(substr(self::$cmd, 0, 1) === '~')
+		if((substr(self::$cmd, 0, 1) === '~') || (substr(self::$cmd, 0, 1) === '@'))
 			self::$cmd = 'channel/' . substr(self::$cmd, 1);

 		/*