Cleanup. Check ASAP. Return with #plugin-name

diff --git a/plugin/calendar_viewer.inc.php b/plugin/calendar_viewer.inc.php
index 9a0627b..12ed257 100644 (file)
--- a/plugin/calendar_viewer.inc.php
+++ b/plugin/calendar_viewer.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*
  * PukiWiki calendar_viewer¥×¥é¥°¥¤¥ó
- * $Id: calendar_viewer.inc.php,v 1.21 2004/08/10 13:39:25 henoheno Exp $
+ * $Id: calendar_viewer.inc.php,v 1.22 2004/08/10 13:44:52 henoheno Exp $
  * calendarrecent¥×¥é¥°¥¤¥ó¤ò¸µ¤ËºîÀ®
  */
 
@@ -48,21 +48,19 @@ function plugin_calendar_viewer_convert()
        global $_msg_calendar_viewer_right, $_msg_calendar_viewer_left;
        global $_msg_calendar_viewer_restrict;
 
+       // °ú¿ô¤Î³Îǧ
+       if (func_num_args() < 2)
+               return '#calendar_viewer(): ' . $_err_calendar_viewer_param . '<br />';
+
+       $func_vars_array = func_get_args();
+
        // ¥Ç¥Õ¥©¥ë¥ÈÃÍ
-       $pagename   = '';       // ´ð½à¤È¤Ê¤ë¥Ú¡¼¥¸Ì¾
+       $pagename = $func_vars_array[0];        // ´ð½à¤È¤Ê¤ë¥Ú¡¼¥¸Ì¾
        $limit_page = 7;        // ɽ¼¨¤¹¤ë·ï¿ôÀ©¸Â
        $date_YM    = '';       // °ìÍ÷ɽ¼¨¤¹¤ëǯ·î
        $mode       = 'past';   // Æ°ºî¥â¡¼¥É
        $date_sep   = '-';      // ÆüÉդΥ»¥Ñ¥ì¡¼¥¿ calendar2¤Ê¤é '-', calendar¤Ê¤é ''
 
-
-       // °ú¿ô¤Î³Îǧ
-       if (func_num_args() < 2) return $_err_calendar_viewer_param;
-
-       $func_vars_array = func_get_args();
-
-       $pagename = $func_vars_array[0];
-
        if (isset($func_vars_array[3])) {
                $date_sep = $func_vars_array[3];
        }
@@ -88,7 +86,7 @@ function plugin_calendar_viewer_convert()
                $limit_page  = $reg_array[1] + $reg_array[2];
                $limit_pitch = $reg_array[2];
        } else {
-               return $_err_calendar_viewer_param2;
+               return '#calendar_viewer(): ' . $_err_calendar_viewer_param2 . '<br />';
        }
 
        if (isset($func_vars_array[2]) &&