Things I noticed for s9y.github.io

This commit is contained in:
Garvin Hicking 2015-03-19 16:17:30 +01:00
parent 5f14b67e66
commit e7d822be11
3 changed files with 14 additions and 1 deletions

View File

@ -426,7 +426,7 @@ function serendipity_printComments($comments, $parentid = 0, $depth = 0, $trace
return true; return true;
} }
$serendipity['smarty']->assignByRef($smarty_block == 'COMMENTS'?'comments':'trackbacks', $_smartyComments); $serendipity['smarty']->assignByRef($smarty_block == 'COMMENTS' ? 'comments' : 'trackbacks', $_smartyComments);
unset($_smartyComments); unset($_smartyComments);
return serendipity_smarty_fetch($smarty_block, $smarty_file); return serendipity_smarty_fetch($smarty_block, $smarty_file);

View File

@ -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) { function serendipity_hash($string) {
global $serendipity; global $serendipity;
@ -2244,6 +2250,12 @@ function serendipity_hash($string) {
return sha1($serendipity['hashkey'] . $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) { function serendipity_passwordhash($cleartext_password) {
global $serendipity; global $serendipity;

View File

@ -100,6 +100,7 @@
<p><span lang="en">Powered by <a href="http://s9y.org">Serendipity</a> &amp; the <a href="http://github.com/yellowled/s9y-2k11">2k11</a> theme.</span></p> <p><span lang="en">Powered by <a href="http://s9y.org">Serendipity</a> &amp; the <a href="http://github.com/yellowled/s9y-2k11">2k11</a> theme.</span></p>
</footer> </footer>
</div> </div>
<script src="{serendipity_getFile file="js/2k11.min.js"}"></script> <script src="{serendipity_getFile file="js/2k11.min.js"}"></script>
{/if} {/if}
{$raw_data} {$raw_data}