Changeset 936:edcdbfa04aa9 for plugins/widgets

Timestamp:

10/29/12 17:35:27 (13 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

{{tpl:Widgets}} without type attribute set displays all widgets (from nav, extra and custom), fixes #577

File:

• plugins/widgets/_public.php (modified) (1 diff)

plugins/widgets/_public.php

@@ -22 +22 @@
      public static function tplWidgets($attr)
      {
-          $type = isset($attr['type']) ? $attr['type'] : 'nav';
-          
+          $type = isset($attr['type']) ? $attr['type'] : '';
+
           # widgets to disable
           $disable = isset($attr['disable']) ? trim($attr['disable']) : '';
           
-          return
-          '<?php '.
-          "publicWidgets::widgetsHandler('".addslashes($type)."','".addslashes($disable)."'); ".
-          ' ?>';
+          if ($type == '') {
+               $res = "publicWidgets::widgetsHandler('nav','".addslashes($disable)."');"."\n".
+                    "   publicWidgets::widgetsHandler('extra','".addslashes($disable)."');"."\n".
+                    "   publicWidgets::widgetsHandler('custom','".addslashes($disable)."');"."\n";
+          } else {
+               if (!in_array($type, array('nav','extra','custom'))) {
+                    $type = 'nav';
+               }
+               $res = "publicWidgets::widgetsHandler('".addslashes($type)."','".addslashes($disable)."');";
+          }
+          return '<?php '.$res.' ?>';
      }