MERGE: リビジョン1859。Item取得にManagerクラスによるキャッシュ機構を利用

[nucleus-jp/nucleus-next.git] / nucleus / libs / ENCAPSULATE.php

diff --git a/nucleus/libs/ENCAPSULATE.php b/nucleus/libs/ENCAPSULATE.php
index 3974754..93a465b 100644 (file)
--- a/nucleus/libs/ENCAPSULATE.php
+++ b/nucleus/libs/ENCAPSULATE.php
@@ -38,9 +38,10 @@ class Encapsulate
                {\r
                        $templateName = '';\r
                }\r
+               $params[4] = $errorMessage;\r
                // start output buffering\r
                ob_start();\r
-\r
+               \r
                $nbOfRows = call_user_func_array($call, $params);\r
 \r
                // get list contents and stop buffering\r
@@ -79,13 +80,13 @@ class NavList extends Encapsulate
                $this->itemid    = $itemid;\r
        }\r
 \r
-       function showBatchList($batchtype, $query, $type, $template, $errorMessage = _LISTS_NOMORE)\r
+       function showBatchList($batchtype, $query, $type, $template, $errorMessage = _LISTS_NOMORE, $templateName = '')\r
        {\r
                $batch = new Batch($batchtype);\r
 \r
                $this->doEncapsulate(\r
                                array(&$batch, 'showlist'),\r
-                               array(&$query, $type, $template),\r
+                               array(&$query, $type, $template, $templateName),\r
                                $errorMessage\r
                );\r
 \r
@@ -197,16 +198,18 @@ class Batch extends Encapsulate
 //             $this->showOperationList();\r
        }\r
 \r
-       function showFoot($templateName = '') {\r
+       function showFoot($templateName = '')\r
+       {\r
                $this->showOperationList();\r
-               ?>\r
+?>\r
                        </form>\r
-               <?php   }\r
+<?php\r
+       }\r
 \r
        function showOperationList()\r
        {\r
                global $manager;\r
-               ?>\r
+?>\r
                <div class="batchoperations">\r
                        <?php echo _BATCH_WITH_SEL ?>\r
                        <select name="batchaction">\r
@@ -272,7 +275,8 @@ class Batch extends Encapsulate
                <?php   }\r
 \r
        // shortcut :)\r
-       function showList($query, $type, $template, $errorMessage = _LISTS_NOMORE, $templateName = '') {\r
+       function showList($query, $type, $template, $templateName = '', $errorMessage = _LISTS_NOMORE)\r
+       {\r
                return $this->doEncapsulate(    'showlist',\r
                                                                        array($query, $type, $template, $templateName),\r
                                                                        $errorMessage\r