Index: branches/unlabeled/unlabeled-1.71.2/core/kernel/db/db_tag_processor.php =================================================================== diff -u -r7874 -r7895 --- branches/unlabeled/unlabeled-1.71.2/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 7874) +++ branches/unlabeled/unlabeled-1.71.2/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 7895) @@ -543,11 +543,15 @@ return $value; } - function AddCurrencySymbol($value, $iso) + function AddCurrencySymbol($value, $iso, $foce_sign=false) { $currency =& $this->Application->recallObject('curr.-'.$iso, null, Array('skip_autoload' => true)); if( !$currency->isLoaded() ) $currency->Load($iso, 'ISO'); + if ($foce_sign) { + $value = ($value > 0 ?'+':'').$value; // nothing for negative values, since they already include sign + } + $symbol = $currency->GetDBField('Symbol'); if (!$symbol) $symbol = $currency->GetDBField('ISO').' '; if ($currency->GetDBField('SymbolPosition') == 0) { Index: branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/changelog_4_0_1.txt =================================================================== diff -u -r7822 -r7895 --- branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/changelog_4_0_1.txt (.../changelog_4_0_1.txt) (revision 7822) +++ branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/changelog_4_0_1.txt (.../changelog_4_0_1.txt) (revision 7895) @@ -5,9 +5,8 @@ File in-portal/admin/install/inportal_schema.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.4 +File in-portal/admin/install/upgrades/changelog_4_0_1.txt is new; release_4_0_1 revision 1.1.2.5 File in-portal/admin/install/upgrades/inportal_upgrade_v4.0.1.sql is new; release_4_0_1 revision 1.1.2.5 -File in-portal/admin/install/upgrades/inportal_upgrade_v4.0.2.sql is new; release_4_0_1 revision 1.1.2.2 File in-portal/admin/users/adduser.php changed File in-portal/kernel/frontaction.php changed File in-portal/kernel/parser.php changed @@ -20,11 +19,19 @@ File in-portal/kernel/admin_templates/stylesheets/stylesheets_edit_base.tpl changed File in-portal/kernel/admin_templates/stylesheets/stylesheets_edit_block.tpl changed File in-portal/kernel/admin_templates/stylesheets/stylesheets_list.tpl changed +File in-portal/kernel/admin_templates/users/users_edit.tpl is new; release_4_0_1 revision 1.1.2.1 +File in-portal/kernel/admin_templates/users/users_edit_custom.tpl is new; release_4_0_1 revision 1.1.2.1 +File in-portal/kernel/admin_templates/users/users_edit_groups.tpl is new; release_4_0_1 revision 1.1.2.1 +File in-portal/kernel/admin_templates/users/users_edit_tabs.tpl is new; release_4_0_1 revision 1.1.2.1 +File in-portal/kernel/admin_templates/users/users_list.tpl is new; release_4_0_1 revision 1.1.4.1 File in-portal/kernel/cache/.cvsignore changed File in-portal/kernel/images/.cvs is removed; release_1_4_0 revision 1.1 +File in-portal/kernel/include/category.php changed File in-portal/kernel/include/emailmessage.php changed File in-portal/kernel/include/image.php changed +File in-portal/kernel/include/itemdb.php changed File in-portal/kernel/include/parseditem.php changed +File in-portal/kernel/include/tag-class.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 @@ -74,7 +81,6 @@ 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/event.php changed 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/unit_config_reader.php changed @@ -104,6 +110,7 @@ File kernel.X/core/admin_templates/modules/modules_list.tpl changed File kernel.X/core/admin_templates/regional/languages_list.tpl changed File kernel.X/core/admin_templates/regional/phrases_edit.tpl changed +File kernel.X/core/admin_templates/tools/system_tools.tpl changed File kernel.X/core/units/admin/admin_config.php changed File kernel.X/core/units/admin/admin_events_handler.php changed File kernel.X/core/units/admin/admin_tag_processor.php changed @@ -112,6 +119,7 @@ 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/configuration/configuration_config.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 @@ -122,12 +130,12 @@ File kernel.X/core/units/general/xml_helper.php changed File kernel.X/core/units/general/helpers/helpers_config.php changed File kernel.X/core/units/general/helpers/modules.php changed +File kernel.X/core/units/general/helpers/multilanguage.php changed File kernel.X/core/units/general/helpers/priority_helper.php is new; release_4_0_1 revision 1.1.2.1 File kernel.X/core/units/general/helpers/recursive_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/import_xml.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/modules/modules_config.php changed @@ -141,7 +149,7 @@ 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.php is new; release_4_0_1 revision 1.1.2.1 +File kernel.X/core/install/upgrades.php is new; release_4_0_1 revision 1.1.2.3 File kernel.X/core/install/upgrades.sql changed File cmseditor/fckconfig.js changed File cmseditor/editor/dialog/fck_docprops.html changed @@ -153,4 +161,4 @@ ! 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 +! m/d/Yg:i:s Am/d/Yg:i:s A.'iso-8859-12