Merge branch 'issue94_smartyupdate' of https://github.com/flatpressbl…

…og/flatpress into issue94_smartyupdate

CHANGELOG.md

@@ -2,6 +2,7 @@
 ## General
 - Template engine Smarty updated to version 4.1.0 (see [#94](https://github.com/flatpressblog/flatpress/issues/94))
   - From now on, FlatPress requires at least PHP 7.1!
+  - Please make sure your themes and plugins continue to work with the new Smarty version
 - Added [SECURITY.md](https://github.com/flatpressblog/flatpress/blob/master/SECURITY.md)
 - [README](https://github.com/flatpressblog/flatpress/blob/master/README.md): added "help and support" section
 

fp-includes/core/core.system.php

@@ -68,7 +68,7 @@ function system_hashsalt_save($force = false) {
 	return true;
 }
 
-define('SYSTEM_VER', '1.3.dev [master]');
+define('SYSTEM_VER', '1.3.dev [smartyupdate]');
 
 function system_ver() {
 	return 'fp-' . SYSTEM_VER;

fp-includes/smarty-4.1.0/libs/plugins/function.comment_form.php

@@ -0,0 +1,15 @@
+<?php
+/*
+ * Smarty plugin
+ * -------------------------------------------------------------
+ * File:     function.comment_form.php
+ * Type:     function
+ * Name:     commentform
+ * Purpose:  print out the comment form
+ * -------------------------------------------------------------
+ */
+function smarty_function_comment_form($params, &$smarty)
+{
+    return do_action('comment_form');
+}
+?> 

search.php

@@ -142,7 +142,7 @@ function smarty_search_result($params, $content, &$smarty, &$repeat) {
 		// assign values to template
 		$smarty->assign('id', $id);
 		$post = $e;
-		+$smarty->assign($e);
+		$smarty->assign($e);
 		$repeat = true;
 		// advance pointer to next search result element
 		next($srchresults);