Merge remote-tracking branch 'mainWebdip/master' into webdipMerge

Fixed merge conflicts.
Disabled loading of dark mode variant CSS files (as not existing for most variants).
Altered sql install scripts to avoid dataloss.

admin/adminActionsForum.php

@@ -121,6 +121,7 @@ private static function setNextActivePostSilence($silenceID)
 			}
 		}
 	}
+
 	private static function setNextActiveUserSilence($silenceID) 
 	{
 		global $DB;
@@ -140,6 +141,7 @@ private static function setNextActiveUserSilence($silenceID)
 			}
 		}
 	}
+
 	public function disableSilence(array $params) 
 	{
 		$silence = new Silence($params['silenceID']);
@@ -155,6 +157,7 @@ public function disableSilence(array $params)
 
 		return l_t('%s disabled.',$silence->toString());
 	}
+
 	public function disableSilenceConfirm(array $params) 
 	{
 		$silence = new Silence($params['silenceID']);
@@ -179,6 +182,7 @@ public function changeSilenceLength(array $params)
 
 		return l_t('%s changed from <i>%s</i> to <i>%s</i>.',$silence->toString(),Silence::printLength($previousLength),Silence::printLength($silence->length));
 	}
+
 	public function changeSilenceLengthConfirm(array $params) 
 	{
 		$silence = new Silence($params['silenceID']);
@@ -231,6 +235,7 @@ public function createUserSilence(array $params)
 		$silence = new Silence($silenceID);
 		return l_t('User silenced:').' <br/>' .$silence->toString();
 	}
+
 	public function createUserSilenceConfirm(array $params)
 	{
 		self::checkSilenceParams($params);
@@ -257,6 +262,7 @@ public function createThreadSilence(array $params)
 		$silence = new Silence($silenceID);
 		return l_t('Thread silenced:').' <br/>' .$silence->toString();
 	}
+
 	public function createThreadSilenceConfirm(array $params)
 	{
 		self::checkSilenceParams($params);
@@ -281,13 +287,15 @@ public function createUserThreadSilence(array $params)
 		$silence = new Silence($silenceID);
 		return l_t('User and thread silenced:').' <br/>' .$silence->toString();
 	}
+
 	public function createUserThreadSilenceConfirm(array $params)
 	{
 		self::checkSilenceParams($params);
 
 		return l_t('Are you sure you want to silence this user %s, and silence the thread they were posting in, because <i>%s</i> ?',
 			Silence::printLength($params['length']),$params['reason']);
 	}
+
 	public function syncForumLikes(array $params)
 	{
 		global $DB;