escape % in file_tag_query as it is ultimately embedded in a sprintf

2 files changed, 5 insertions, 1 deletions

diff --git a/boot.php b/boot.php
index ec1ffbbf4..6309a5f9b 100755
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1297' );
+define ( 'FRIENDICA_VERSION',      '2.3.1298' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1134      );
 
diff --git a/include/text.php b/include/text.php
index f758c37ee..64f6f72a8 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1306,6 +1306,10 @@ function file_tag_decode($s) {
 }
 
 function file_tag_file_query($table,$s,$type = 'file') {
+
+	// this is ultimately going into a vsprintf
+	$s = str_replace('%','%%',$s);
+
 	if($type == 'file')
 		$str = preg_quote( '[' . file_tag_encode($s) . ']' );
 	else