diff --git a/classes/db/DB.class.php b/classes/db/DB.class.php index 9c6c527b5..2940370d0 100644 --- a/classes/db/DB.class.php +++ b/classes/db/DB.class.php @@ -236,7 +236,7 @@ switch($filter_type) { case 'email' : - case 'email_adderss' : + case 'email_address' : if(!eregi('^[_0-9a-z-]+(\.[_0-9a-z-]+)*@[0-9a-z-]+(\.[0-9a-z-]+)*$', $val)) return new Object(-1, sprintf($lang->filter->invalid_email, $lang->{$key}?$lang->{$key}:$key)); break; case 'homepage' : diff --git a/plugins/calendar/calendar.class.php b/plugins/calendar/calendar.class.php index 63fffb10a..9c63e6626 100644 --- a/plugins/calendar/calendar.class.php +++ b/plugins/calendar/calendar.class.php @@ -29,8 +29,9 @@ // 템플릿 파일에서 사용할 변수들을 세팅 $plugin_info->cur_date = date('Ym'); + $plugin_info->today_str = sprintf('%2d%s %2d%s',date('m'), Context::getLang('unit_month'), date('d'), Context::getLang('unit_day')); $plugin_info->last_day = date('t'); - $plugin_info->start_week= date('L'); + $plugin_info->start_week= date('w', mktime(0,0,0,date('m'),1,date('Y'))); if(count($mid_list)==1) $plugin_info->module_name = $mid_list[0]; $plugin_info->title = $title; diff --git a/plugins/calendar/skins/blog_calendar_list/list.html b/plugins/calendar/skins/blog_calendar_list/list.html index 8501a9c8f..5f6584024 100644 --- a/plugins/calendar/skins/blog_calendar_list/list.html +++ b/plugins/calendar/skins/blog_calendar_list/list.html @@ -9,7 +9,7 @@