diff --git a/include/functions_comments.inc.php b/include/functions_comments.inc.php index 5d6725bf..867fc68e 100644 --- a/include/functions_comments.inc.php +++ b/include/functions_comments.inc.php @@ -426,7 +426,7 @@ function serendipity_printComments($comments, $parentid = 0, $depth = 0, $trace return true; } - $serendipity['smarty']->assignByRef($smarty_block == 'COMMENTS'?'comments':'trackbacks', $_smartyComments); + $serendipity['smarty']->assignByRef($smarty_block == 'COMMENTS' ? 'comments' : 'trackbacks', $_smartyComments); unset($_smartyComments); return serendipity_smarty_fetch($smarty_block, $smarty_file); diff --git a/include/functions_config.inc.php b/include/functions_config.inc.php index ae740da7..a279cd8c 100644 --- a/include/functions_config.inc.php +++ b/include/functions_config.inc.php @@ -2234,6 +2234,12 @@ function serendipity_hasPluginPermissions($plugin, $groupid = null) { } } +/** + * Return the SHA1 (with pre-hash) of a value + * + * @param string The string to hash + * @return string The hashed string + */ function serendipity_hash($string) { global $serendipity; @@ -2244,6 +2250,12 @@ function serendipity_hash($string) { return sha1($serendipity['hashkey'] . $string); } +/** + * Backwards-compatibility to recognize old-style md5 passwords to allow migration + * + * @param string The string to hash + * @param string Either SHA1 or MD5 hash, depending on value + */ function serendipity_passwordhash($cleartext_password) { global $serendipity; diff --git a/templates/2k11/index.tpl b/templates/2k11/index.tpl index cf4c696a..f93b7cd4 100644 --- a/templates/2k11/index.tpl +++ b/templates/2k11/index.tpl @@ -100,6 +100,7 @@
Powered by Serendipity & the 2k11 theme.
+ {/if} {$raw_data}