Index: /branches/release-36/php/lib/function.mtwidgetmanager.php
===================================================================
--- /branches/release-36/php/lib/function.mtwidgetmanager.php (revision 2091)
+++ /branches/release-36/php/lib/function.mtwidgetmanager.php (revision 2091)
@@ -0,0 +1,50 @@
+<?php
+# Movable Type (r) Open Source (C) 2001-2008 Six Apart, Ltd.
+# This program is distributed under the terms of the
+# GNU General Public License, version 2.
+#
+# $Id$
+
+require_once("function.mtinclude.php");
+function smarty_function_mtwidgetmanager($args, &$ctx) {
+    $blog_id = $args['blog_id'];
+    $blog_id or $blog_id = $ctx->stash('blog_id');
+    $blog_id or $blog_id = 0;
+    $widgetmanager = $args['name']; // Should we try to load is there's only one?
+    if (!$widgetmanager) 
+        return;
+
+    $tmpl = $ctx->mt->db->get_template_text($ctx, $widgetmanager, $blog_id, 'widgetset', $args['global']);
+    if ( !isset($tmpl) || !$tmpl ) {
+        # TODO: doing save_widgetset should write template text
+        # error status for now to see if there is any pattern
+        # that requires to consturct includes from template meta (modulesets).
+        return $ctx->error($ctx->mt->translate('Error: widgetset [_1] is empty.', $widgetmanager));
+    }
+    if ( isset($tmpl) && $tmpl ) {
+        // push to ctx->vars
+        $ext_args = array();
+        while(list ($key, $val) = each($args)) {
+            if (!preg_match('/(^name$|^blog_id$)/', $key)) {
+                require_once("function.mtsetvar.php");
+                smarty_function_mtsetvar(array('name' => $key, 'value' => $val), $ctx);
+                $ext_args[] = $key;
+            }
+        }
+        if ($ctx->_compile_source('evaluated template', $tmpl, $_var_compiled)) {
+            ob_start();
+            $ctx->_eval('?>' . $_var_compiled);
+            $_contents = ob_get_contents();
+            ob_end_clean();
+            _clear_vars($ctx, $ext_args);
+            return $_contents;
+        }
+        else {
+            _clear_vars($ctx, $ext_args);
+            return $ctx->error($ctx->mt->translate('Error compiling widgetset [_1]', $widgetmanager));
+        }
+    }
+    return '';
+}
+?>
+
Index: /branches/release-36/php/lib/mtdb_base.php
===================================================================
--- /branches/release-36/php/lib/mtdb_base.php (revision 2049)
+++ /branches/release-36/php/lib/mtdb_base.php (revision 2091)
@@ -360,5 +360,5 @@
     function get_template_text($ctx, $module, $blog_id = null, $type = 'custom', $global = null) {
         $blog_id or $blog_id = $ctx->stash('blog_id');
-        if (($type === 'custom' || $type === 'widget')) {
+        if ($type === 'custom' || $type === 'widget'|| $type === 'widgetset') {
             $col = 'template_name';
             $type_filter = "and template_type='$type'";
Index: /branches/release-36/php/lib/function.mtwidgetset.php
===================================================================
--- /branches/release-36/php/lib/function.mtwidgetset.php (revision 2091)
+++ /branches/release-36/php/lib/function.mtwidgetset.php (revision 2091)
@@ -0,0 +1,13 @@
+<?php
+# Movable Type (r) Open Source (C) 2001-2008 Six Apart, Ltd.
+# This program is distributed under the terms of the
+# GNU General Public License, version 2.
+#
+# $Id$
+
+require_once("function.mtwidgetmanager.php");
+function smarty_function_mtwidgetset($args, &$ctx) {
+    return smarty_function_mtwidgetmanager($args, $ctx);
+}
+?>
+