Index: branches/unlabeled/unlabeled-1.71.2/core/units/users/users_event_handler.php =================================================================== diff -u -r7732 -r7765 --- branches/unlabeled/unlabeled-1.71.2/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 7732) +++ branches/unlabeled/unlabeled-1.71.2/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 7765) @@ -46,7 +46,7 @@ if ($event->Special == 'regular') { $object->addFilter('primary_filter', 'ug.GroupId <> 11'); } - + if (!$this->Application->IsAdmin()) { $object->addFilter('status_filter', '%1$s.Status = '.STATUS_ACTIVE); } @@ -693,7 +693,7 @@ $user_email = $this->Application->RecallVar('SubscriberEmail'); if (preg_match("/^[_a-zA-Z0-9-\.]+@[a-zA-Z0-9-\.]+\.[a-z]{2,4}$/", $user_email)){ - + $this->RemoveRequiredFields($object); if($object->Load(array('Email'=>$user_email))){ $group_info = $this->GetGroupInfo($object->GetID()); Index: branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/changelog_4_0_1.txt =================================================================== diff -u -r7712 -r7765 --- branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/changelog_4_0_1.txt (.../changelog_4_0_1.txt) (revision 7712) +++ branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/changelog_4_0_1.txt (.../changelog_4_0_1.txt) (revision 7765) @@ -1,9 +1,18 @@ +File in-portal/admin/email/do_send.php changed File in-portal/admin/install/inportal_data.sql changed +File in-portal/admin/install/inportal_remove.sql changed +File in-portal/admin/install/langpacks/english.lang changed File in-portal/admin/install/upgrades/changelog_1_4_0.txt changed +File in-portal/admin/install/upgrades/changelog_4_0_1.txt is new; release_4_0_1 revision 1.1.2.1 File in-portal/admin/install/upgrades/inportal_upgrade_4_0_1.sql is new; release_4_0_1 revision 1.1.2.1 -File in-portal/admin/install/upgrades/inportal_upgrade_v4.0.1.sql is new; release_4_0_1 revision 1.1.2.2 +File in-portal/admin/install/upgrades/inportal_upgrade_v4.0.1.sql is new; release_4_0_1 revision 1.1.2.4 File in-portal/kernel/frontaction.php changed +File in-portal/kernel/parser.php changed +File in-portal/kernel/admin/include/toolbar/sendmail.php changed File in-portal/kernel/admin_templates/incs/catalog.js changed +File in-portal/kernel/cache/.cvsignore changed +File in-portal/kernel/include/emailmessage.php changed +File in-portal/kernel/include/parseditem.php changed File in-portal/kernel/include/theme.php changed File in-portal/kernel/include/usersession.php changed File in-portal/kernel/include/compat/array_change_key_case.php changed @@ -36,43 +45,72 @@ File in-portal/kernel/include/compat/version_compare.php changed File in-portal/kernel/include/compat/vprintf.php changed File in-portal/kernel/include/compat/vsprintf.php changed +File in-portal/themes/default/register/register_form.tpl changed File kernel4_dev/kernel4/application.php changed +File kernel4_dev/kernel4/constants.php changed +File kernel4_dev/kernel4/event_manager.php changed File kernel4_dev/kernel4/startup.php changed +File kernel4_dev/kernel4/db/db_event_handler.php changed File kernel4_dev/kernel4/db/db_tag_processor.php changed +File kernel4_dev/kernel4/db/dbitem.php changed File kernel4_dev/kernel4/db/dblist.php changed File kernel4_dev/kernel4/processors/main_processor.php changed File kernel4_dev/kernel4/session/session.php changed +File kernel4_dev/kernel4/utility/debugger.php changed +File kernel4_dev/kernel4/utility/email.php is removed; release_1_4_0 revision 1.16 +File kernel4_dev/kernel4/utility/email_send.php is new; release_4_0_1 revision 1.1.4.2 +File kernel4_dev/kernel4/utility/smtp_client.php is removed; release_1_4_0 revision 1.3 +File kernel4_dev/kernel4/utility/socket.php is new; release_4_0_1 revision 1.1.4.1 File kernel4_dev/kernel4/utility/debugger/debugger.css changed File kernel4_dev/kernel4/utility/debugger/debugger.js changed File kernel4_dev/kernel4/utility/formatters/multilang_formatter.php changed File kernel.X/core/admin_templates/incs/footer.tpl changed +File kernel.X/core/admin_templates/incs/header.tpl changed +File kernel.X/core/admin_templates/js/forms.js is new; release_4_0_1 revision 1.1.2.3 +File kernel.X/core/admin_templates/js/grid.js changed +File kernel.X/core/admin_templates/js/grid_scroller.js changed File kernel.X/core/admin_templates/js/script.js changed File kernel.X/core/admin_templates/js/toolbar.js changed +File kernel.X/core/admin_templates/js/tree.js changed File kernel.X/core/admin_templates/js/calendar/calendar-setup.js changed File kernel.X/core/admin_templates/js/calendar/calendar.js changed File kernel.X/core/admin_templates/regional/phrases_edit.tpl changed +File kernel.X/core/units/admin/admin_events_handler.php changed +File kernel.X/core/units/categories/cache_updater.php changed File kernel.X/core/units/categories/categories_config.php changed +File kernel.X/core/units/categories/categories_event_handler.php changed +File kernel.X/core/units/categories/categories_item.php changed File kernel.X/core/units/categories/categories_tag_processor.php changed File kernel.X/core/units/custom_fields/custom_fields_config.php changed File kernel.X/core/units/email_events/email_events_event_handler.php changed File kernel.X/core/units/email_messages/email_messages_config.php changed +File kernel.X/core/units/general/cat_dbitem_export.php changed +File kernel.X/core/units/general/cat_event_handler.php changed +File kernel.X/core/units/general/cat_tag_processor.php changed +File kernel.X/core/units/general/inp1_parser.php changed +File kernel.X/core/units/general/xml_helper.php changed File kernel.X/core/units/general/helpers/search_helper.php changed +File kernel.X/core/units/general/helpers/themes_helper.php changed File kernel.X/core/units/groups/groups_config.php changed File kernel.X/core/units/languages/languages_config.php changed +File kernel.X/core/units/languages/languages_event_handler.php changed File kernel.X/core/units/phrases/phrases_config.php changed File kernel.X/core/units/translator/translator_config.php changed +File kernel.X/core/units/user_groups/user_groups_dbitem.php changed File kernel.X/core/units/users/users_config.php changed File kernel.X/core/units/users/users_event_handler.php changed +File kernel.X/core/install/english.lang changed File kernel.X/core/install/install_data.sql changed +File kernel.X/core/install/install_schema.sql changed +File kernel.X/core/install/upgrades.sql changed File cmseditor/fckconfig.js changed File cmseditor/editor/dialog/fck_docprops.html changed -File cmseditor/editor/dialog/fck_document.html changed -File cmseditor/editor/dialog/fck_find.html changed -File cmseditor/editor/dialog/fck_replace.html changed -File cmseditor/editor/dialog/fck_select.html changed +File cmseditor/editor/dialog/fck_link/fck_link.js changed File cmseditor/editor/filemanager/browser/default/connectors/php/commands.php changed Changes in phrases and events: +! m/d/Yg:i:s Am/d/Yg:i:s A,.iso-8859-12 +! m/d/Yg:i:s Am/d/Yg:i:s A.,iso-8859-12