diff --git a/bundled-libs/.current_version b/bundled-libs/.current_version index bee8b66d..24013013 100644 --- a/bundled-libs/.current_version +++ b/bundled-libs/.current_version @@ -1,11 +1,13 @@ -Cache_Lite 1.5.1 -HTTP_Request 1.2.4 -Net_CheckIP 1.1 -Net_Socket 1.0.6 -Net_URL 1.0.14 -PEAR 1.3.5 -Text_Wiki 0.25.0 -XML_RPC 1.4.0 +Cache_Lite 1.54 +HTTP_Request 1.43 +Net_CheckIP 1.5 +Net_DNSBL 1.4 +Net_Socket 1.24 +Net_URL 1.36 +Net_SURBL 1.4 Onyx 1.0 (customized) -Smarty 2.6.9 -Net_DNSBL 1.0.0 \ No newline at end of file +PEAR 1.83 +SimplePie 1.2.1 +Smarty 3.1.14 +Text_Wiki 1.27 +XML_RPC 1.5.5 diff --git a/bundled-libs/docs/SamplePage.wiki.txt b/bundled-libs/docs/SamplePage.wiki.txt index f78522e3..d6e45ed3 100644 --- a/bundled-libs/docs/SamplePage.wiki.txt +++ b/bundled-libs/docs/SamplePage.wiki.txt @@ -32,10 +32,10 @@ will be printed.) || {{```''italic text''```}} || ''italic text'' || || {{```'''bold text'''```}} || '''bold text''' || || {{```'''''italic and bold'''''```}} || '''''italic and bold''''' || -|| {{```//emphasis//```}} || //emphasis// || -|| {{```**strong**```}} || **strong** || -|| {{```//**emphasis and strong**//```}} || //**emphasis and strong**// || -|| {{```**//strong and emphasis//**```}} || **//strong and emphasis//** || +|| {{```//emphasis//```}} || //emphasis// || +|| {{```**strong**```}} || **strong** || +|| {{```//**emphasis and strong**//```}} || //**emphasis and strong**// || +|| {{```**//strong and emphasis//**```}} || **//strong and emphasis//** || || {{```{{teletype text}}```}} || {{teletype text}} || || {{<```php:function()```>}} || || || {{```@@--- delete text +++ insert text @@```}} || @@--- delete text +++ insert text @@ || diff --git a/bundled-libs/docs/TokenRuleKeys.wiki.txt b/bundled-libs/docs/TokenRuleKeys.wiki.txt index c002f3a3..700de552 100644 --- a/bundled-libs/docs/TokenRuleKeys.wiki.txt +++ b/bundled-libs/docs/TokenRuleKeys.wiki.txt @@ -21,7 +21,7 @@ || {{strong}} || Strong (usually bold) text. || {{type:[start|end]}} || || {{superscript}} || Superscript text. || {{type:[start|end]}} || || {{table}} || Table elements. || {{type:[table|row|cell]_[start|end], colspan}} || -|| {{tt}} || Teletype (monospaced) text. || {{type:[start|end]}} || +|| {{tt}} || Teletype (monospaced) text. || {{type:[start|end]}} || || {{url}} || A page URL. || {{type:[inline|footnote|descr]}}, {{href}}, {{text}} || || {{wikilink}} || A local !WikiPage reference. || {{page}}, {{anchor}} || || {{toc}} || Table of contents. || {{type:[list_start|list_end|item_start|item_end|target], level, count}} || diff --git a/include/functions_comments.inc.php b/include/functions_comments.inc.php index 872c51ef..1e741626 100644 --- a/include/functions_comments.inc.php +++ b/include/functions_comments.inc.php @@ -663,18 +663,18 @@ function serendipity_approveComment($cid, $entry_id, $force = false, $moderate = return false; // wrong user having no adminEntriesMaintainOthers right } - $flip = false; - if ($moderate === 'flip') { - $flip = true; + $flip = false; + if ($moderate === 'flip') { + $flip = true; - if ($rs['status'] == 'pending') { - $sql = "UPDATE {$serendipity['dbPrefix']}comments SET status = 'approved' WHERE id = ". (int)$cid; - $moderate = false; - } else { - $sql = "UPDATE {$serendipity['dbPrefix']}comments SET status = 'pending' WHERE id = ". (int)$cid; - $moderate = true; - } - } elseif ($moderate) { + if ($rs['status'] == 'pending') { + $sql = "UPDATE {$serendipity['dbPrefix']}comments SET status = 'approved' WHERE id = ". (int)$cid; + $moderate = false; + } else { + $sql = "UPDATE {$serendipity['dbPrefix']}comments SET status = 'pending' WHERE id = ". (int)$cid; + $moderate = true; + } + } elseif ($moderate) { $sql = "UPDATE {$serendipity['dbPrefix']}comments SET status = 'pending' WHERE id = ". (int)$cid; } else { $sql = "UPDATE {$serendipity['dbPrefix']}comments SET status = 'approved' WHERE id = ". (int)$cid; @@ -727,11 +727,11 @@ function serendipity_approveComment($cid, $entry_id, $force = false, $moderate = serendipity_plugin_api::hook_event('backend_approvecomment', $rs); } - if ($flip) { - if ($moderate) return -1; // comment set to pending - if (!$moderate) return 1; // comment set to approved - } - + if ($flip) { + if ($moderate) return -1; // comment set to pending + if (!$moderate) return 1; // comment set to approved + } + return true; } diff --git a/include/functions_config.inc.php b/include/functions_config.inc.php index aca18d9f..25b0d728 100644 --- a/include/functions_config.inc.php +++ b/include/functions_config.inc.php @@ -1008,7 +1008,7 @@ function serendipity_getSessionLanguage() { $lang = $serendipity['COOKIE']['userDefLang']; } else { $lang = $serendipity['lang']; - } + } } $serendipity['detected_lang'] = null; } @@ -2138,17 +2138,17 @@ function serendipity_loadGlobalThemeOptions(&$template_config, &$template_loaded 'scope' => 'global' ); - // This always needs to be present, if not it could happen that the template options do have an older version of this variable - $template_config[] = $conf_amount; + // This always needs to be present, if not it could happen that the template options do have an older version of this variable + $template_config[] = $conf_amount; if (!isset($template_loaded_config['amount']) || empty($template_loaded_config['amount'])) { $template_loaded_config['amount'] = $conf_amount['default']; } - // Check if we are currently inside the admin interface. - if ($serendipity['POST']['adminModule'] == 'templates' && $serendipity['POST']['adminAction'] == 'configure' && !empty($serendipity['POST']['template']['amount'])) { - $template_loaded_config['amount'] = (int)$serendipity['POST']['template']['amount']; - } + // Check if we are currently inside the admin interface. + if ($serendipity['POST']['adminModule'] == 'templates' && $serendipity['POST']['adminAction'] == 'configure' && !empty($serendipity['POST']['template']['amount'])) { + $template_loaded_config['amount'] = (int)$serendipity['POST']['template']['amount']; + } for ($i = 0; $i < $template_loaded_config['amount']; $i++) { $navlinks[] = array( diff --git a/serendipity_config.inc.php b/serendipity_config.inc.php index e2a972b0..0ae19f98 100644 --- a/serendipity_config.inc.php +++ b/serendipity_config.inc.php @@ -133,7 +133,7 @@ if (!isset($serendipity['languages'])) { 'fi' => 'Finnish', 'cs' => 'Czech (Win-1250)', 'cz' => 'Czech (ISO-8859-2)', - 'sk' => 'Slovak', + 'sk' => 'Slovak', 'nl' => 'Dutch', 'is' => 'Icelandic', 'tr' => 'Turkish', diff --git a/templates/2k11/comments_by_author.tpl b/templates/2k11/comments_by_author.tpl index da369182..d6894d6c 100644 --- a/templates/2k11/comments_by_author.tpl +++ b/templates/2k11/comments_by_author.tpl @@ -1,13 +1,13 @@

{$CONST.COMMENTS}

{foreach from=$comments_by_authors item="entry_comments"}
-

{$entry_comments.title|@default:$entry_comments.link}

-
{$entry_comments.tpl_comments}
+

{$entry_comments.title|@default:$entry_comments.link}

+
{$entry_comments.tpl_comments}
{/foreach} {if $footer_info or $footer_prev_page or $footer_next_page}