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

upgrader data['call_tasks'] fix

Browse Source
This commit is contained in:
Ian 2012-04-10 14:48:50 +02:00
parent bc8bab6100
commit 278546d1c6
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/admin/tpl/upgrader.inc.tpl
View File

@ -1,7 +1,3 @@
{if $task_function}
{'Calling %s ...<br />'|sprintf:(is_array($task['function']) ? $task['function'][0] . '::'. $task['function'][1] : $task['function'])}
{/if}
{if $errors}
{$CONST.DIAGNOSTIC_ERROR}<br /><br />
<div class="serendipityAdminMsgError">- <img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file='admin/img/admin_msg_error.png'}" alt="" />{foreach $errors AS $implode_err}{$implode_err}{if (count($errors) > 1) && !$implode_err@last}<br /> {/if}{/foreach}</div><br /><br />
@ -14,7 +10,7 @@
{foreach $call_tasks AS $ctask}
{if $is_callable_task}
{'Calling %s ...<br />'|sprintf:( is_array($ctask.function) ? "{$ctask.function.0} :: {$ctask.function.1}" : "$ctask.function" )}
{$ctasks}
{/if}
{/foreach}

2
include/admin/upgrader.inc.php
View File

@ -214,7 +214,7 @@ if ($serendipity['GET']['action'] == 'ignore') {
if (!empty($task['function']) && version_compare($serendipity['versionInstalled'], $task['version'], '<') ) {
if (is_callable($task['function'])) {
$data['is_callable_task'] = true;
$data['call_tasks'][] = $task;
$data['call_tasks'][] = sprintf('Calling %s ...<br />', (is_array($task['function']) ? $task['function'][0] . '::'. $task['function'][1] : $task['function']));
if (empty($task['arguments'])) {
call_user_func($task['function']);