tab2spaces (all file w/o templates yet)
This commit is contained in:
Ian
parent
a7a70ca90a
commit
3d89bbb2a2
@ -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
|
||||
PEAR 1.83
|
||||
SimplePie 1.2.1
|
||||
Smarty 3.1.14
|
||||
Text_Wiki 1.27
|
||||
XML_RPC 1.5.5
|
||||
|
||||
@ -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()```>}} || <php:function()> ||
|
||||
|| {{```@@--- delete text +++ insert text @@```}} || @@--- delete text +++ insert text @@ ||
|
||||
|
||||
@ -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}} ||
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
|
||||
@ -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(
|
||||
|
||||
@ -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',
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
<h2 class="visuallyhidden">{$CONST.COMMENTS}</h2>
|
||||
{foreach from=$comments_by_authors item="entry_comments"}
|
||||
<article class="clearfix serendipity_entry{if $entry_comments.entryauthor == $entry_comments.author} serendipity_comment_author_self{/if}">
|
||||
<h3><a href="{$entry_comments.link}">{$entry_comments.title|@default:$entry_comments.link}</a></h3>
|
||||
<div class="comments_for_entry">{$entry_comments.tpl_comments}</div>
|
||||
<h3><a href="{$entry_comments.link}">{$entry_comments.title|@default:$entry_comments.link}</a></h3>
|
||||
<div class="comments_for_entry">{$entry_comments.tpl_comments}</div>
|
||||
</article>
|
||||
{/foreach}
|
||||
{if $footer_info or $footer_prev_page or $footer_next_page}
|
||||
<nav class="serendipity_pagination block_level comments_by_author_pagination">
|
||||
<ul class="clearfix">
|
||||
<ul class="clearfix">
|
||||
{if $footer_info}
|
||||
<li class="info"><span>{$footer_info}</span></li>
|
||||
{/if}
|
||||
|
||||
@ -235,7 +235,7 @@ a:hover.serendipityPrettyButton {
|
||||
.serendipityPrettyButton {
|
||||
padding: 1px;
|
||||
background: url({TEMPLATE_PATH}img/button_background.png) repeat-x top;
|
||||
background-color: #95accc;
|
||||
background-color: #95accc;
|
||||
color: #1D2E3F;
|
||||
font-weight: bold;
|
||||
font-size: 0.9em;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user