mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity

Merge branch '2.0' of github.com:s9y/Serendipity into 2.0

Browse Source
This commit is contained in:
Matthias Mees 2013-01-04 19:08:32 +01:00
commit 6f306c1622
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/admin/plugins.inc.php
View File

@ -243,6 +243,7 @@ if (isset($_GET['serendipity']['plugin_to_conf'])) {
}
ksort($pluggroups);
$data['count_pluginstack'] = count($pluginstack);
$data['errorstack'] = $errorstack;
if ($serendipity['GET']['only_group'] == 'UPGRADE') {

3
include/admin/tpl/plugins.inc.tpl
View File

@ -41,8 +41,7 @@
{$config}
</form>
{elseif $adminAction == 'addnew'}
{* BUG: $pluginstack always is 0 in 2.0? *}
<h2>{if $type == 'event'}{$CONST.EVENT_PLUGINS}{else}{$CONST.SIDEBAR_PLUGINS}{/if} <span class="plugins_available">{$CONST.PLUGIN_AVAILABLE_COUNT|sprintf:"count({$pluginstack})"}</span></h2>
<h2>{if $type == 'event'}{$CONST.EVENT_PLUGINS}{else}{$CONST.SIDEBAR_PLUGINS}{/if} <span class="plugins_available">{$CONST.PLUGIN_AVAILABLE_COUNT|sprintf:$count_pluginstack}</span></h2>
{foreach $errorstack as $e_idx => $e_name}
<span class="msg_error"><span class="icon-attention"></span> {$CONST.ERROR}: {$e_name}</span>
{/foreach}

2
include/admin/tplold/plugins.inc.tpl
View File

@ -156,7 +156,7 @@
{/foreach}
{/foreach}
<tr>
<td colspan="2" align="right">{$CONST.PLUGIN_AVAILABLE_COUNT|sprintf:"count({$pluginstack})"}</td>
<td colspan="2" align="right">{$CONST.PLUGIN_AVAILABLE_COUNT|sprintf:$count_pluginstack}</td>
</tr>
</table>
{else}