Index: branches/unlabeled/unlabeled-1.27.2/core/units/admin/admin_tag_processor.php
===================================================================
diff -u -r7577 -r7579
--- branches/unlabeled/unlabeled-1.27.2/core/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 7577)
+++ branches/unlabeled/unlabeled-1.27.2/core/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 7579)
@@ -410,17 +410,23 @@
function FCKEditor($params)
{
- include_once(FULL_PATH.'/core/cmseditor/fckeditor.php');
+ if (file_exists(FULL_PATH.'/core/cmseditor/fckeditor.php')) {
+ $editor_path = 'core/cmseditor/';
+ }
+ else {
+ $editor_path = 'admin/editor/cmseditor/';
+ }
+ include_once(FULL_PATH.'/'.$editor_path.'/fckeditor.php');
$oFCKeditor = new FCKeditor($params['name']);
- $oFCKeditor->BasePath = BASE_PATH.'/core/cmseditor/';
+ $oFCKeditor->BasePath = BASE_PATH.'/'.$editor_path;
$oFCKeditor->Width = $params['width'] ;
$oFCKeditor->Height = $params['height'] ;
$oFCKeditor->ToolbarSet = 'Advanced' ;
$oFCKeditor->Value = '' ;
$oFCKeditor->Config = Array(
//'UserFilesPath' => $pathtoroot.'kernel/user_files',
'ProjectPath' => BASE_PATH.'/',
- 'CustomConfigurationsPath' => $this->Application->BaseURL().'core/cmseditor/fckconfig.js',
+ 'CustomConfigurationsPath' => $this->Application->BaseURL().$editor_path.'fckconfig.js',
// 'EditorAreaCSS' => $this->Application->BaseURL().'/themes/inportal_site/inc/inportal.css', //GetThemeCSS(),
//'StylesXmlPath' => '../../inp_styles.xml',
// 'Debug' => 1,
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/popups/editor.tpl
===================================================================
diff -u -r7029 -r7579
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/popups/editor.tpl (.../editor.tpl) (revision 7029)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/popups/editor.tpl (.../editor.tpl) (revision 7579)
@@ -1,4 +1,4 @@
-
+
Index: branches/unlabeled/unlabeled-1.100.2/admin/install/langpacks/english.lang
===================================================================
diff -u -r7564 -r7579
--- branches/unlabeled/unlabeled-1.100.2/admin/install/langpacks/english.lang (.../english.lang) (revision 7564)
+++ branches/unlabeled/unlabeled-1.100.2/admin/install/langpacks/english.lang (.../english.lang) (revision 7579)
@@ -6,6 +6,7 @@
QWN0aXZl
QWRkZWQ=
QWRkIFRv
+ QWRtaW5pc3RyYXRpdmUgQ29uc29sZQ==
QWx3YXlz
YW5k
QWN0aXZl
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/header.tpl
===================================================================
diff -u -r7474 -r7579
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/header.tpl (.../header.tpl) (revision 7474)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/header.tpl (.../header.tpl) (revision 7579)
@@ -2,7 +2,7 @@
-In-Portal :: Administration Panel
+ -
@@ -34,6 +34,9 @@
var $base_path = '';
var img_path = '/img/';
+NumberFormatter.ThousandsSep = '';
+NumberFormatter.DecimalSep = '';
+
window.name += '_';
Index: branches/unlabeled/unlabeled-1.34.2/core/units/general/cat_dbitem.php
===================================================================
diff -u -r7532 -r7579
--- branches/unlabeled/unlabeled-1.34.2/core/units/general/cat_dbitem.php (.../cat_dbitem.php) (revision 7532)
+++ branches/unlabeled/unlabeled-1.34.2/core/units/general/cat_dbitem.php (.../cat_dbitem.php) (revision 7579)
@@ -156,6 +156,10 @@
$original_checked = true;
} while ($res !== false);
$this->SetDBField($title_field, $new_name);
+
+ // this is needed, because Create will create items in its own CategoryId (if it's set),
+ // but we need to create it in target Paste category @see{kCatDBItem::Create} and its primary_category detection
+ $this->SetDBField('CategoryId', $cat_id);
}
function MoveToCat($cat_id=null)
Index: branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/changelog_1_4_0.txt
===================================================================
diff -u -r7564 -r7579
--- branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/changelog_1_4_0.txt (.../changelog_1_4_0.txt) (revision 7564)
+++ branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/changelog_1_4_0.txt (.../changelog_1_4_0.txt) (revision 7579)
@@ -26,7 +26,7 @@
File in-portal/admin/install/upgrade_errors.php changed
File in-portal/admin/install/langpacks/english.lang changed
File in-portal/admin/install/upgrades/changelog_1_3_0.txt changed
-File in-portal/admin/install/upgrades/changelog_1_4_0.txt is new; release_1_4_0 revision 1.1.2.13
+File in-portal/admin/install/upgrades/changelog_1_4_0.txt is new; release_1_4_0 revision 1.1.2.14
File in-portal/admin/install/upgrades/inportal_upgrade_v1.3.2.sql is new; release_1_4_0 revision 1.1.2.2
File in-portal/admin/install/upgrades/inportal_upgrade_v1.4.0.sql is new; release_1_4_0 revision 1.1.2.1
File in-portal/admin/users/adduser.php changed
@@ -70,6 +70,7 @@
File in-portal/kernel/admin_templates/advanced_view.tpl changed
File in-portal/kernel/admin_templates/catalog.tpl changed
File in-portal/kernel/admin_templates/catalog_tab.tpl changed
+File in-portal/kernel/admin_templates/group_selector.tpl is new; release_1_4_0 revision 1.1.2.1
File in-portal/kernel/admin_templates/head.tpl is removed; release_1_3_1 revision 1.4
File in-portal/kernel/admin_templates/index.tpl is removed; release_1_3_1 revision 1.8
File in-portal/kernel/admin_templates/login.tpl is removed; release_1_3_1 revision 1.4
@@ -258,7 +259,7 @@
File in-portal/kernel/units/relationship/relationship_event_handler.php changed
File in-portal/kernel/units/reviews/reviews_event_handler.php changed
File in-portal/kernel/units/reviews/reviews_tag_processor.php changed
-File in-portal/kernel/units/sections/sections_config.php is new; release_1_4_0 revision 1.1.2.4
+File in-portal/kernel/units/sections/sections_config.php is new; release_1_4_0 revision 1.1.2.5
File in-portal/kernel/units/selectors/selectors_event_handler.php changed
File in-portal/kernel/units/statistics/statistics_event_handler.php changed
File in-portal/kernel/units/stylesheets/stylesheets_config.php changed
@@ -669,16 +670,16 @@
File kernel.X/core/admin_templates/incs/close_popup.tpl is new; release_1_4_0 revision 1.1.2.7
File kernel.X/core/admin_templates/incs/config_blocks.tpl is new; release_1_4_0 revision 1.1
File kernel.X/core/admin_templates/incs/footer.tpl is new; release_1_4_0 revision 1.1.2.8
-File kernel.X/core/admin_templates/incs/form_blocks.tpl is new; release_1_4_0 revision 1.4.2.11
+File kernel.X/core/admin_templates/incs/form_blocks.tpl is new; release_1_4_0 revision 1.4.2.12
File kernel.X/core/admin_templates/incs/fw_menu.js is new; release_1_4_0 revision 1.1
File kernel.X/core/admin_templates/incs/grid_blocks.tpl is new; release_1_4_0 revision 1.1.2.15
-File kernel.X/core/admin_templates/incs/header.tpl is new; release_1_4_0 revision 1.1.2.9
+File kernel.X/core/admin_templates/incs/header.tpl is new; release_1_4_0 revision 1.1.2.10
File kernel.X/core/admin_templates/incs/in-portal.tpl is new; release_1_4_0 revision 1.1
File kernel.X/core/admin_templates/incs/menu_blocks.tpl is new; release_1_4_0 revision 1.1.2.5
File kernel.X/core/admin_templates/incs/nlsmenu.css is new; release_1_4_0 revision 1.1.2.1
File kernel.X/core/admin_templates/incs/sections_list.css is new; release_1_4_0 revision 1.1.2.1
File kernel.X/core/admin_templates/incs/style.css is new; release_1_4_0 revision 1.2.2.10
-File kernel.X/core/admin_templates/incs/tab_blocks.tpl is new; release_1_4_0 revision 1.2.2.2
+File kernel.X/core/admin_templates/incs/tab_blocks.tpl is new; release_1_4_0 revision 1.2.2.3
File kernel.X/core/admin_templates/js/ajax.js is new; release_1_4_0 revision 1.1.2.7
File kernel.X/core/admin_templates/js/calendar.js is new; release_1_4_0 revision 1.1.2.3
File kernel.X/core/admin_templates/js/grid.js is new; release_1_4_0 revision 1.1.2.4
@@ -698,7 +699,7 @@
File kernel.X/core/admin_templates/js/calendar/calendar.js is new; release_1_4_0 revision 1.1.2.1
File kernel.X/core/admin_templates/modules/modules_list.tpl is new; release_1_4_0 revision 1.1.2.1
File kernel.X/core/admin_templates/popups/column_picker.tpl is new; release_1_4_0 revision 1.1.2.8
-File kernel.X/core/admin_templates/popups/editor.tpl is new; release_1_4_0 revision 1.1.2.2
+File kernel.X/core/admin_templates/popups/editor.tpl is new; release_1_4_0 revision 1.1.2.3
File kernel.X/core/admin_templates/popups/translator.tpl is new; release_1_4_0 revision 1.1.2.3
File kernel.X/core/admin_templates/regional/email_messages_edit.tpl is new; release_1_4_0 revision 1.1.2.3
File kernel.X/core/admin_templates/regional/languages_edit.tpl is new; release_1_4_0 revision 1.1.2.6
@@ -715,7 +716,7 @@
File kernel.X/core/units/dummy is new; release_1_4_0 revision 1.1
File kernel.X/core/units/admin/admin_config.php is new; release_1_4_0 revision 1.20.2.6
File kernel.X/core/units/admin/admin_events_handler.php is new; release_1_4_0 revision 1.4.2.6
-File kernel.X/core/units/admin/admin_tag_processor.php is new; release_1_4_0 revision 1.27.2.20
+File kernel.X/core/units/admin/admin_tag_processor.php is new; release_1_4_0 revision 1.27.2.22
File kernel.X/core/units/categories/cache_updater.php is new; release_1_4_0 revision 1.8.2.5
File kernel.X/core/units/categories/categories_config.php is new; release_1_4_0 revision 1.54.2.1
File kernel.X/core/units/categories/categories_event_handler.php is new; release_1_4_0 revision 1.25.2.16
@@ -736,7 +737,7 @@
File kernel.X/core/units/email_messages/email_messages_config.php is new; release_1_4_0 revision 1.2.52.1
File kernel.X/core/units/email_messages/email_messages_event_handler.php is new; release_1_4_0 revision 1.5.2.1
File kernel.X/core/units/general/brackets.php is new; release_1_4_0 revision 1.4
-File kernel.X/core/units/general/cat_dbitem.php is new; release_1_4_0 revision 1.34.2.4
+File kernel.X/core/units/general/cat_dbitem.php is new; release_1_4_0 revision 1.34.2.5
File kernel.X/core/units/general/cat_dbitem_export.php is new; release_1_4_0 revision 1.22.2.1
File kernel.X/core/units/general/cat_dblist.php is new; release_1_4_0 revision 1.4
File kernel.X/core/units/general/cat_event_handler.php is new; release_1_4_0 revision 1.68.2.3
@@ -745,7 +746,7 @@
File kernel.X/core/units/general/custom_fields.php is new; release_1_4_0 revision 1.8
File kernel.X/core/units/general/general_config.php is new; release_1_4_0 revision 1.10.2.1
File kernel.X/core/units/general/inp1_parser.php is new; release_1_4_0 revision 1.16
-File kernel.X/core/units/general/inp_ses_storage.php is new; release_1_4_0 revision 1.22
+File kernel.X/core/units/general/inp_ses_storage.php is new; release_1_4_0 revision 1.22.2.1
File kernel.X/core/units/general/main_event_handler.php is new; release_1_4_0 revision 1.15
File kernel.X/core/units/general/xml_helper.php is new; release_1_4_0 revision 1.6
File kernel.X/core/units/general/helpers/captcha_helper.php is new; release_1_4_0 revision 1.1.2.1
@@ -761,8 +762,8 @@
File kernel.X/core/units/general/helpers/search_helper.php is new; release_1_4_0 revision 1.4.2.6
File kernel.X/core/units/general/helpers/sections_helper.php is new; release_1_4_0 revision 1.11.2.4
File kernel.X/core/units/general/helpers/themes_helper.php is new; release_1_4_0 revision 1.1.2.1
-File kernel.X/core/units/groups/groups_config.php is new; release_1_4_0 revision 1.15.2.1
-File kernel.X/core/units/groups/groups_event_handler.php is new; release_1_4_0 revision 1.2
+File kernel.X/core/units/groups/groups_config.php is new; release_1_4_0 revision 1.15.2.2
+File kernel.X/core/units/groups/groups_event_handler.php is new; release_1_4_0 revision 1.2.2.1
File kernel.X/core/units/groups/groups_item.php is new; release_1_4_0 revision 1.1
File kernel.X/core/units/languages/import_xml.php is new; release_1_4_0 revision 1.22.2.1
File kernel.X/core/units/languages/languages_config.php is new; release_1_4_0 revision 1.19.2.3
@@ -780,9 +781,10 @@
File kernel.X/core/units/themes/themes_tag_processor.php is new; release_1_4_0 revision 1.7
File kernel.X/core/units/translator/translator_config.php is new; release_1_4_0 revision 1.4
File kernel.X/core/units/translator/translator_event_handler.php is new; release_1_4_0 revision 1.9
-File kernel.X/core/units/user_groups/user_groups_config.php is new; release_1_4_0 revision 1.3.2.1
+File kernel.X/core/units/user_groups/user_groups_config.php is new; release_1_4_0 revision 1.3.2.2
File kernel.X/core/units/user_groups/user_groups_dbitem.php is new; release_1_4_0 revision 1.1.4.1
-File kernel.X/core/units/users/users_config.php is new; release_1_4_0 revision 1.32.2.3
+File kernel.X/core/units/user_groups/user_groups_eh.php is new; release_1_4_0 revision 1.1.2.1
+File kernel.X/core/units/users/users_config.php is new; release_1_4_0 revision 1.32.2.5
File kernel.X/core/units/users/users_event_handler.php is new; release_1_4_0 revision 1.68.2.15
File kernel.X/core/units/users/users_item.php is new; release_1_4_0 revision 1.13
File kernel.X/core/units/users/users_syncronize.php is new; release_1_4_0 revision 1.4