FIX:バッチ処理中のメッセージが正しく表示されなかったのでパースの順序を修正

デフォルトテンプレートの該当箇所調整

diff --git a/nucleus/libs/AdminActions.php b/nucleus/libs/AdminActions.php
index 63ec78b..7b20a69 100644 (file)
--- a/nucleus/libs/AdminActions.php
+++ b/nucleus/libs/AdminActions.php
@@ -976,10 +976,10 @@ class AdminActions extends BaseActions
                
                if ( !array_key_exists('ADMIN_BATCHLIST', $templates) || empty($templates['ADMIN_BATCHLIST']) )
                {
-                       $template = '<li><%text(_BATCH_EXECUTING)%>'
-                                 . '<b><%adminbatchaction%></b>'
-                                 . '<%batchlisttype%>'
-                                 . '<b><%batchid%></b>...'
+                       $template = '<li><%text(_BATCH_EXECUTING)%>&nbsp;'
+                                 . '<b><%adminbatchaction%></b>&nbsp;'
+                                 . '<%batchlisttype%>&nbsp;'
+                                 . '<b><%batchid%></b>...&nbsp;'
                                  . '<b><%batchlistmsg%></b>'
                                  . '</li>' . "\n";
                }
@@ -1079,11 +1079,12 @@ class AdminActions extends BaseActions
                        $handler = new AdminActions('template');
                        $parser = new Parser($handler);
                        
+                       $output = Template::fill($template, $data);
                        ob_start();
-                       $parser->parse($template);
-                       $template = ob_get_contents();
+                       $parser->parse($output);
+                       $output = ob_get_contents();
                        ob_end_clean();
-                       echo Template::fill($template, $data);
+                       echo "{$output}<br />";
                }
                return;
        }

diff --git a/skins/admin/default/skinbackup.xml b/skins/admin/default/skinbackup.xml
index 84e948e..88cceed 100644 (file)
--- a/skins/admin/default/skinbackup.xml
+++ b/skins/admin/default/skinbackup.xml
@@ -2764,7 +2764,7 @@ selector();
     </td>
     <td id="td<%count%>">
         <textarea class="templateedit" name="<%name%>" tabindex="<%tabindex%>" cols="50" rows="<%rows%>" id="textarea<%count%>">]]></part>
-    <part name="ADMIN_BATCHLIST"><![CDATA[<li><%text(_BATCH_EXECUTING)%<b><%adminbatchaction%></b><%batchlisttype%> <b><%batchid%></b>...<b><%batchlistmsg%></b></li>
+    <part name="ADMIN_BATCHLIST"><![CDATA[<li><%text(_BATCH_EXECUTING)%&nbsp;<b><%adminbatchaction%></b>&nbsp;<%batchlisttype%>&nbsp;<b><%batchid%></b>...&nbsp;<b><%batchlistmsg%></b></li>
 ]]></part>
     <part name="ADMIN_BLOGLINK"><![CDATA[<a href="<%url%>" title="<%adminbloglinktitle%>"><%blogname%></a>]]></part>
     <part name="ADMIN_CUSTOMHELPLINK_ANCHOR"><![CDATA[<a href="<%helpurl%>#<%helptarget%>" title="<%title%>" <%onclick%>>]]></part>