Merge pull request #78 from flatCore/develop

Merge Develop Branch

README.md

@@ -2,7 +2,7 @@
 
 ## flatCore CMS
 
-flatCore is a lightweight Content Management System based on PHP and SQLite. MySQL database support is in progress and will be released soon.
+flatCore is a lightweight Content Management System based on PHP and MySQL or SQLite.
 
 <img alt="GitHub release (latest by date)" src="https://img.shields.io/github/v/release/flatCore/flatCore-CMS"> <img alt="GitHub" src="https://img.shields.io/github/license/flatCore/flatCore-CMS"> <img alt="GitHub commit activity" src="https://img.shields.io/github/commit-activity/m/flatCore/flatCore-CMS"> [![huntr](https://cdn.huntr.dev/huntr_security_badge_mono.svg)](https://huntr.dev)
 
@@ -34,7 +34,6 @@ This branch will be merged into main branch, as soon as a new stable version is
 + bootstrap-tagsinput - https://github.com/bootstrap-tagsinput/bootstrap-tagsinput
 + clipboard.js- https://github.com/zenorocha/clipboard.js
 + DropzoneJS - http://www.dropzonejs.com
-+ fancyBox - http://fancyapps.com/fancybox/3/
 + featherlight - https://github.com/noelboss/featherlight/
 + image-picker - https://github.com/rvera/image-picker
 + jQuery - https://jquery.com/

acp/core/functions.php

@@ -928,7 +928,7 @@ function fc_write_media_data($filename,$title=NULL,$notes=NULL,$keywords=NULL,$t
 		$string_labels = "";
 	}	
 
-	$filetype = mime_content_type("../$filename");
+	$filetype = mime_content_type(realpath($filename));
 
 	$cnt = $db_content->count("fc_media", [
 		"AND" => [

core/search.php

@@ -9,12 +9,17 @@
 	$search_msg = $lang['msg_search_undersized'];
 }
 
+$msg_no_serach_results = get_textlib('no_search_results',$languagePack);
+if($msg_no_serach_results == '') {
+	$msg_no_serach_results = $lang['msg_search_no_results'];
+}
+
 if($s != '' && $start_search == "true") {
 
 	$sr = fc_search($s,1,10);
 	$cnt_result = count($sr);
 	if($cnt_result < 1) {
-		$search_msg = $lang['msg_search_no_results'];
+		$search_msg = $msg_no_serach_results;
 	} else {
 		$search_msg = sprintf($lang['msg_search_results'], $cnt_result);