Permalink
Browse files

upgrader data['call_tasks'] fix

  • Loading branch information...
1 parent bc8bab6 commit 278546d1c6fc20cd8dfb27498e03db74a686b88c @ophian ophian committed Apr 10, 2012
Showing with 2 additions and 6 deletions.
  1. +1 −5 include/admin/tpl/upgrader.inc.tpl
  2. +1 −1 include/admin/upgrader.inc.php
@@ -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}
@@ -214,7 +214,7 @@ function serendipity_smarty_backend_upgraderResultDiagnose($params, $smarty) {
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']);

0 comments on commit 278546d

Please sign in to comment.