diff --git a/include/functions_entries.inc.php b/include/functions_entries.inc.php index a5357604..ed6ff026 100644 --- a/include/functions_entries.inc.php +++ b/include/functions_entries.inc.php @@ -834,7 +834,7 @@ function &serendipity_searchEntries($term, $limit = '', $searchresults = '') { $limit = serendipity_db_limit_sql($limit); $term = serendipity_db_escape_string($term); - $cond = array(); + $cond = array('having' => ''); $relevance_enabled = false; if ($serendipity['dbType'] == 'postgres' || $serendipity['dbType'] == 'pdo-postgres') { diff --git a/include/genpage.inc.php b/include/genpage.inc.php index 147f0c7b..398f440d 100644 --- a/include/genpage.inc.php +++ b/include/genpage.inc.php @@ -91,7 +91,7 @@ switch ($serendipity['GET']['action']) { array( 'content_message' => sprintf(YOUR_SEARCH_RETURNED_BLAHBLAH, '' . $serendipity['GET']['searchTerm'] . '', '' . serendipity_getTotalEntries() . ''), 'searchresult_results' => true, - 'searchresult_fullentry' => $serendipity['GET']['fullentry'] + 'searchresult_fullentry' => $serendipity['GET']['fullentry'] ?? null ) ); diff --git a/templates/bootstrap4/commentform.tpl b/templates/bootstrap4/commentform.tpl index 51ee0e34..a4023724 100644 --- a/templates/bootstrap4/commentform.tpl +++ b/templates/bootstrap4/commentform.tpl @@ -8,18 +8,18 @@
- - + +
- - + +
- - + +
@@ -28,8 +28,8 @@
- - + +
{serendipity_hookPlugin hook="frontend_comment" data=$commentform_entry} {if $is_commentform_showToolbar} diff --git a/templates/bootstrap4/comments.tpl b/templates/bootstrap4/comments.tpl index f94a357c..d4fe87b3 100644 --- a/templates/bootstrap4/comments.tpl +++ b/templates/bootstrap4/comments.tpl @@ -13,7 +13,7 @@ {/if} {if $entry.allow_comments AND $comment.body != 'COMMENT_DELETED'} - {$CONST.REPLY} + {$CONST.REPLY}
{/if} diff --git a/templates/bootstrap4/config.inc.php b/templates/bootstrap4/config.inc.php index 3d1d9252..62fc27f6 100644 --- a/templates/bootstrap4/config.inc.php +++ b/templates/bootstrap4/config.inc.php @@ -103,9 +103,9 @@ $template_config = array( ); $template_global_config = array('navigation' => true); -$template_loaded_config = serendipity_loadThemeOptions($template_config, $serendipity['smarty_vars']['template_option'], true); +$template_loaded_config = serendipity_loadThemeOptions($template_config, $serendipity['smarty_vars']['template_option'] ?? '', true); serendipity_loadGlobalThemeOptions($template_config, $template_loaded_config, $template_global_config); -if ($_SESSION['serendipityUseTemplate']) { +if (isset($_SESSION['serendipityUseTemplate']) && $_SESSION['serendipityUseTemplate']) { $template_loaded_config['use_corenav'] = false; } diff --git a/templates/bootstrap4/entries.tpl b/templates/bootstrap4/entries.tpl index 97cc85d0..6d498a26 100644 --- a/templates/bootstrap4/entries.tpl +++ b/templates/bootstrap4/entries.tpl @@ -34,7 +34,7 @@ {if $entry.has_comments}
  • {$entry.label_comments}{$entry.comments}
  • {/if} - {if $entry.freetag.tags.tags} + {if isset($entry.freetag.tags.tags) && $entry.freetag.tags.tags}
  • Tags{foreach from=$entry.freetag.tags.tags item="tag"}{$tag} {/foreach}
  • {/if} @@ -109,8 +109,8 @@ {/if} {/foreach} -{if not $is_preview} - {if $staticpage_pagetitle == ''} +{if not $is_preview and ! $is_single_entry} + {if ! isset($staticpage_pagetitle) || $staticpage_pagetitle == ''}