Merge remote-tracking branch 'upstream/master' into social-master

Signed-off-by: Roland Haeder <roland@mxchange.org>

diff --cc actions/deleteuser.php
Simple merge

diff --cc lib/profileformaction.php
Simple merge

diff --cc lib/urlmapper.php
Simple merge

diff --cc plugins/ModHelper/ModHelperPlugin.php
index b37ea445788aa651a7172ec0dad28bcaebb62199,88f2f2a73185977e6b79b4aab196e9379cc8bd1f..c5ec8854a5cdf7e29e87a8d60f90edd81753c046
--- 1/plugins/ModHelper/ModHelperPlugin.php
--- 2/plugins/ModHelper/ModHelperPlugin.php
+++ b/plugins/ModHelper/ModHelperPlugin.php
@@@ -42,10 -40,12 +40,12 @@@ class ModHelperPlugin extends Plugi
          return true;
      }
  
 -    function onUserRightsCheck($profile, $right, &$result)
 +    function onUserRightsCheck(Profile $profile, $right, &$result)
      {
          if (in_array($right, self::$rights)) {
-             // Hrm.... really we should confirm that the *other* user isn't privleged. :)
+             // To silence a profile without accidentally silencing other
+             // privileged users, always call Profile->silenceAs($actor)
+             // since it checks target's privileges too.
              if ($profile->hasRole('modhelper')) {
                  $result = true;
                  return false;