Merge branch 'bugfix' into fix_sanitize_style

Author: svivian

.gitignore

@@ -1,6 +1,9 @@
-# Ignore config file in development
-qa-config.php
-qa-cache/*/
+# Ignore Q2A config file and .htaccess in development
+/qa-config.php
+/.htaccess
+
+# Ignore cached files
+/qa-cache/*/
 
 # Other files
 .DS_Store

.htaccess

@@ -0,0 +1,16 @@
+# In order for the web server to process this file it must be renamed to ".htaccess"
+
+Options -Indexes
+DirectoryIndex index.php
+
+<IfModule mod_rewrite.c>
+    RewriteEngine On
+    #RewriteBase /
+
+    RewriteCond %{REQUEST_URI} ^(.*)//(.*)$
+    RewriteRule . %1/%2 [R=301,L]
+
+    RewriteCond %{REQUEST_FILENAME} !-f
+    RewriteCond %{REQUEST_FILENAME} !-d
+    RewriteRule ^.*$ index.php?qa-rewrite=$0&%{QUERY_STRING} [L]
+</IfModule>

.htaccess-example

@@ -1 +1 @@
-1.8.3
+1.8.4

VERSION.txt

@@ -495,7 +495,7 @@ function qa_post_html_fields($post, $userid, $cookieid, $usershtml, $dummy, $opt
 
 		// schema.org microdata - vote display might be formatted (e.g. '2k') so we use meta tag for true count
 		if ($microdata) {
-			$fields['netvotes_view']['suffix'] .= ' <meta itemprop="upvoteCount" content="' . qa_html($netvotes) . '"/>';
+			$fields['netvotes_view']['suffix'] .= ' <meta itemprop="upvoteCount" content="' . qa_html($upvotes - $downvotes) . '"/>';
 			$fields['upvotes_view']['suffix'] .= ' <meta itemprop="upvoteCount" content="' . qa_html($upvotes) . '"/>';
 		}
 
@@ -2359,7 +2359,8 @@ function qa_favorite_form($entitytype, $entityid, $favorite, $title)
 
 /**
  * Format a number using the decimal point and thousand separator specified in the language files.
- * If the number is compacted it is turned into a string such as 1.3k or 2.5m.
+ * If the number is compacted it is turned into a string such as 17.3k (only the thousand/million
+ * cases are currently supported).
  *
  * @since 1.8.0
  * @param integer $number Number to be formatted
@@ -2374,20 +2375,15 @@ function qa_format_number($number, $decimals = 0, $compact = false)
 	$suffix = '';
 
 	if ($compact && qa_opt('show_compact_numbers')) {
-		$decimals = 0;
-		// only the k/m cases are currently supported (i.e. no billions)
+		// when compacting we keep 2-3 significant figures (e.g. 9.1k, 234k)
 		if ($number >= 1000000) {
 			$number /= 1000000;
 			$suffix = qa_lang_html('main/_millions_suffix');
+			$decimals = $number < 100 ? 1 : 0;
 		} elseif ($number >= 1000) {
 			$number /= 1000;
 			$suffix = qa_lang_html('main/_thousands_suffix');
-		}
-
-		// keep decimal part if not 0 and number is short (e.g. 9.1k)
-		$rounded = round($number, 1);
-		if ($number < 100 && ($rounded != (int)$rounded)) {
-			$decimals = 1;
+			$decimals = $number < 100 ? 1 : 0;
 		}
 	}
 

qa-content/jquery-3.3.1.min.js

@@ -798,7 +798,7 @@ function qa_content_prepare($voting = false, $categoryids = array())
 		}
 	}
 
-	$qa_content['script_rel'] = array('qa-content/jquery-3.3.1.min.js');
+	$qa_content['script_rel'] = array('qa-content/jquery-3.5.1.min.js');
 	$qa_content['script_rel'][] = 'qa-content/qa-global.js?' . QA_VERSION;
 
 	if ($voting)

qa-content/jquery-3.5.1.min.js

@@ -543,7 +543,7 @@ function qa_recalc_perform_step(&$state)
 		case 'docacheclear_process':
 			$cacheDriver = Q2A_Storage_CacheFactory::getCacheDriver();
 			$cacheStats = $cacheDriver->getStats();
-			$limit = min($cacheStats['files'], 20);
+			$limit = min($cacheStats['files'], 500);
 
 			if ($cacheStats['files'] > 0 && $next <= $length) {
 				$deleted = $cacheDriver->clear($limit, $next, ($operation === 'docachetrim_process'));

qa-include/app/format.php

@@ -126,6 +126,10 @@ function qa_vote_set($post, $userid, $handle, $cookieid, $vote)
 	$vote = (int)min(1, max(-1, $vote));
 	$oldvote = (int)qa_db_uservote_get($post['postid'], $userid);
 
+	if ($oldvote === $vote) {
+		return;
+	}
+
 	qa_db_uservote_set($post['postid'], $userid, $vote);
 	qa_db_post_recount_votes($post['postid']);