Merge branch 'master' into next-gen

clearurls.js

@@ -32,10 +32,10 @@ var os;
  * for each provider given as parameter.
  *
  * @param  {Provider} provider      Provider-Object
- * @param pureUrl                   URL as String
+ * @param  {string}   pureUrl       URL as String
- * @param {boolean} quiet           if the action should be displayed in log and statistics
+ * @param  {boolean}  quiet         If the action should be displayed in log and statistics
- * @param {requestDetails} request  the request details
+ * @param {requestDetails} request  The request details
- * @return {Array}                  Array with changes and url fields
+ * @return {object}                 Object with changes and url fields
  */
 function removeFieldsFormURL(provider, pureUrl, quiet = false, request = null) {
     let url = pureUrl;
@@ -82,7 +82,7 @@ function removeFieldsFormURL(provider, pureUrl, quiet = false, request = null) {
 
     /*
     * Expand the url by provider redirections. So no tracking on
-    * url redirections form sites to sites.
+    * url redirections form site to site.
     */
     let re = provider.getRedirection(url);
     if (re !== null) {
@@ -92,8 +92,8 @@ function removeFieldsFormURL(provider, pureUrl, quiet = false, request = null) {
         if (!quiet) {
             pushToLog(pureUrl, url, translate('log_redirect'));
             increaseGlobalURLCounter(1);
-            increaseBadged(false, request)
+            increaseBadged(false, request);
-        };
+        }
 
         return {
             "redirect": true,