Index: branches/unlabeled/unlabeled-1.64.2/kernel/units/general/cat_event_handler.php =================================================================== diff -u -r5921 -r5970 --- branches/unlabeled/unlabeled-1.64.2/kernel/units/general/cat_event_handler.php (.../cat_event_handler.php) (revision 5921) +++ branches/unlabeled/unlabeled-1.64.2/kernel/units/general/cat_event_handler.php (.../cat_event_handler.php) (revision 5970) @@ -692,7 +692,14 @@ // processing multilingual fields if (getArrayValue($options, 'formatter') == 'kMultiLanguage') { + $field_list[$key.'_primary'] = 'l'.$this->Application->GetDefaultLanguageId().'_'.$field; $field_list[$key] = 'l'.$lang.'_'.$field; + + if(!isset($search_config[$field]['ForeignField'])) + { + $field_list[$key.'_primary'] = $local_table.'.'.$field_list[$key.'_primary']; + $search_config_map[ $field_list[$key.'_primary'] ] = $field; + } } // processing fields from other tables @@ -767,11 +774,11 @@ $revelance_parts = Array(); reset($search_config); foreach ($field_list as $field) { - $config_elem = each($search_config); - $weight = $search_config[ $search_config_map[$field] ]['Priority']; + $config_elem = $search_config[ $search_config_map[$field] ]; + $weight = $config_elem['Priority']; $revelance_parts[] = 'IF('.$field.' LIKE "%'.implode(' ', $positive_words).'%", '.$weight_sum.', 0)'; foreach ($positive_words as $keyword) { - $revelance_parts[] = 'IF('.$field.' LIKE "%'.$keyword.'%", '.$config_elem['value']['Priority'].', 0)'; + $revelance_parts[] = 'IF('.$field.' LIKE "%'.$keyword.'%", '.$weight.', 0)'; } } $rel_keywords = $this->Application->ConfigValue('SearchRel_Keyword_products') / 100; Index: branches/unlabeled/unlabeled-1.62.2/core/kernel/db/db_tag_processor.php =================================================================== diff -u -r5911 -r5970 --- branches/unlabeled/unlabeled-1.62.2/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 5911) +++ branches/unlabeled/unlabeled-1.62.2/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 5970) @@ -1471,8 +1471,6 @@ { $field = $this->SelectParam($params, 'field,name'); - - $error_var_name = $this->getPrefixSpecial().'_'.$field.'_'.$params['type'].'_error'; $error_msg = $this->Application->RecallVar($error_var_name); if($error_msg) Index: branches/unlabeled/unlabeled-1.58.2/core/kernel/utility/unit_config_reader.php =================================================================== diff -u -r5919 -r5970 --- branches/unlabeled/unlabeled-1.58.2/core/kernel/utility/unit_config_reader.php (.../unit_config_reader.php) (revision 5919) +++ branches/unlabeled/unlabeled-1.58.2/core/kernel/utility/unit_config_reader.php (.../unit_config_reader.php) (revision 5970) @@ -125,7 +125,7 @@ function scanModules($folderPath, $cache = true) { - if (defined('IS_INSTALL') && IS_INSTALL) { + if (defined('IS_INSTALL') && IS_INSTALL && !defined('FORCE_CONFIG_CACHE')) { // disable config caching during installation $cache = false; } Index: branches/unlabeled/unlabeled-1.64.2/core/units/general/cat_event_handler.php =================================================================== diff -u -r5921 -r5970 --- branches/unlabeled/unlabeled-1.64.2/core/units/general/cat_event_handler.php (.../cat_event_handler.php) (revision 5921) +++ branches/unlabeled/unlabeled-1.64.2/core/units/general/cat_event_handler.php (.../cat_event_handler.php) (revision 5970) @@ -692,7 +692,14 @@ // processing multilingual fields if (getArrayValue($options, 'formatter') == 'kMultiLanguage') { + $field_list[$key.'_primary'] = 'l'.$this->Application->GetDefaultLanguageId().'_'.$field; $field_list[$key] = 'l'.$lang.'_'.$field; + + if(!isset($search_config[$field]['ForeignField'])) + { + $field_list[$key.'_primary'] = $local_table.'.'.$field_list[$key.'_primary']; + $search_config_map[ $field_list[$key.'_primary'] ] = $field; + } } // processing fields from other tables @@ -767,11 +774,11 @@ $revelance_parts = Array(); reset($search_config); foreach ($field_list as $field) { - $config_elem = each($search_config); - $weight = $search_config[ $search_config_map[$field] ]['Priority']; + $config_elem = $search_config[ $search_config_map[$field] ]; + $weight = $config_elem['Priority']; $revelance_parts[] = 'IF('.$field.' LIKE "%'.implode(' ', $positive_words).'%", '.$weight_sum.', 0)'; foreach ($positive_words as $keyword) { - $revelance_parts[] = 'IF('.$field.' LIKE "%'.$keyword.'%", '.$config_elem['value']['Priority'].', 0)'; + $revelance_parts[] = 'IF('.$field.' LIKE "%'.$keyword.'%", '.$weight.', 0)'; } } $rel_keywords = $this->Application->ConfigValue('SearchRel_Keyword_products') / 100; Index: branches/unlabeled/unlabeled-1.155.2/core/kernel/application.php =================================================================== diff -u -r5956 -r5970 --- branches/unlabeled/unlabeled-1.155.2/core/kernel/application.php (.../application.php) (revision 5956) +++ branches/unlabeled/unlabeled-1.155.2/core/kernel/application.php (.../application.php) (revision 5970) @@ -382,6 +382,10 @@ WHERE (PrimaryLang = 1) AND (Enabled = 1)'; $language_id = $this->Conn->GetOne($sql); + if (!$language_id && defined('IS_INSTALL') && IS_INSTALL) { + $language_id = 1; + } + return $language_id; } Index: branches/unlabeled/unlabeled-1.50.2/core/units/categories/categories_config.php =================================================================== diff -u -r5842 -r5970 --- branches/unlabeled/unlabeled-1.50.2/core/units/categories/categories_config.php (.../categories_config.php) (revision 5842) +++ branches/unlabeled/unlabeled-1.50.2/core/units/categories/categories_config.php (.../categories_config.php) (revision 5970) @@ -15,7 +15,7 @@ 'CatalogItem' => true, 'AdminTemplatePath' => 'categories', 'AdminTemplatePrefix' => 'categories_', - + 'QueryString' => Array( 1 => 'id', 2 => 'page', @@ -59,7 +59,7 @@ 'category_list' => Array('prefixes' => Array('c_List'), 'format' => "!la_title_Categories! (#c_recordcount#)"), 'catalog' => Array('prefixes' => Array('c_List'), 'format' => "!la_title_Categories! (#c_recordcount#)"), - + 'advanced_view' => Array('prefixes' => Array('c_List'), 'format' => "!la_title_AdvancedView!"), 'categories_edit' => Array('prefixes' => Array('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_General!"), @@ -70,28 +70,28 @@ 'categories_custom' => Array('prefixes' => Array('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Custom!"), 'categories_update' => Array('prefixes' => Array(), 'format' => "!la_title_UpdatingCategories!"), - + 'images_edit' => Array( 'prefixes' => Array('c', 'c-img'), 'new_status_labels' => Array('c-img'=>'!la_title_Adding_Image!'), 'edit_status_labels' => Array('c-img'=>'!la_title_Editing_Image!'), 'new_titlefield' => Array('c-img'=>'!la_title_New_Image!'), 'format' => "#c_status# '#c_titlefield#' - #c-img_status# '#c-img_titlefield#'", ), - + 'relations_edit' => Array( 'prefixes' => Array('c', 'c-rel'), 'new_status_labels' => Array('c-rel'=>"!la_title_Adding_Relationship! '!la_title_New_Relationship!'"), 'edit_status_labels' => Array('c-rel'=>'!la_title_Editing_Relationship!'), 'format' => "#c_status# '#c_titlefield#' - #c-rel_status#", ), - + 'tree_site' => Array('format' => '!la_selecting_categories!'), ), - + 'PermItemPrefix' => 'CATEGORY', - + 'PermSection' => Array('main' => 'CATEGORY:in-portal:categories', /*'search' => 'in-portal:configuration_search',*/ 'email' => 'in-portal:configuration_email', 'custom' => 'in-portal:configuration_custom'), - + 'Sections' => Array( // "Structure & Data" section 'in-portal:site' => Array( @@ -107,7 +107,7 @@ 'in-portal:browse_new' => Array( 'parent' => 'in-portal:site', 'icon' => 'catalog', - 'label' => 'la_K4_Catalog', + 'label' => 'la_tab_Browse', 'url' => Array('t' => 'catalog', 'pass' => 'm'), 'late_load' => Array('t' => 'xml/tree_categories', 'pass' => 'm', 'm_cat_id' => 0), 'onclick' => 'checkCatalog(0)', @@ -118,14 +118,14 @@ 'in-portal:advanced_view_new' => Array( 'parent' => 'in-portal:site', 'icon' => 'advanced_view', - 'label' => 'la_K4_AdvancedView', + 'label' => 'la_tab_AdvancedView', 'url' => Array('t' => 'advanced_view', 'pass' => 'm'), 'permissions' => Array('view'), 'priority' => 0.2, 'type' => stTREE, ), - - 'in-portal:browse' => Array( + + /*'in-portal:browse' => Array( 'parent' => 'in-portal:site', 'icon' => 'catalog', 'label' => 'la_tab_Browse', @@ -134,7 +134,7 @@ 'priority' => 1, 'type' => stTREE, ), - + 'in-portal:advanced_view' => Array( 'parent' => 'in-portal:site', 'icon' => 'advanced_view', @@ -143,7 +143,7 @@ 'permissions' => Array('view'), 'priority' => 2, 'type' => stTREE, - ), + ),*/ 'in-portal:reviews' => Array( 'parent' => 'in-portal:site', Index: branches/unlabeled/unlabeled-1.106.2/admin/install.php =================================================================== diff -u -r5733 -r5970 --- branches/unlabeled/unlabeled-1.106.2/admin/install.php (.../install.php) (revision 5733) +++ branches/unlabeled/unlabeled-1.106.2/admin/install.php (.../install.php) (revision 5970) @@ -1433,6 +1433,7 @@ if($state=="lang_install") { + define('FORCE_CONFIG_CACHE', 1); /* do pack install */ $Offset = (int)$_GET["Offset"]; $Status = (int)$_GET["Status"]; Index: branches/unlabeled/unlabeled-1.50.2/kernel/units/categories/categories_config.php =================================================================== diff -u -r5842 -r5970 --- branches/unlabeled/unlabeled-1.50.2/kernel/units/categories/categories_config.php (.../categories_config.php) (revision 5842) +++ branches/unlabeled/unlabeled-1.50.2/kernel/units/categories/categories_config.php (.../categories_config.php) (revision 5970) @@ -15,7 +15,7 @@ 'CatalogItem' => true, 'AdminTemplatePath' => 'categories', 'AdminTemplatePrefix' => 'categories_', - + 'QueryString' => Array( 1 => 'id', 2 => 'page', @@ -59,7 +59,7 @@ 'category_list' => Array('prefixes' => Array('c_List'), 'format' => "!la_title_Categories! (#c_recordcount#)"), 'catalog' => Array('prefixes' => Array('c_List'), 'format' => "!la_title_Categories! (#c_recordcount#)"), - + 'advanced_view' => Array('prefixes' => Array('c_List'), 'format' => "!la_title_AdvancedView!"), 'categories_edit' => Array('prefixes' => Array('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_General!"), @@ -70,28 +70,28 @@ 'categories_custom' => Array('prefixes' => Array('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Custom!"), 'categories_update' => Array('prefixes' => Array(), 'format' => "!la_title_UpdatingCategories!"), - + 'images_edit' => Array( 'prefixes' => Array('c', 'c-img'), 'new_status_labels' => Array('c-img'=>'!la_title_Adding_Image!'), 'edit_status_labels' => Array('c-img'=>'!la_title_Editing_Image!'), 'new_titlefield' => Array('c-img'=>'!la_title_New_Image!'), 'format' => "#c_status# '#c_titlefield#' - #c-img_status# '#c-img_titlefield#'", ), - + 'relations_edit' => Array( 'prefixes' => Array('c', 'c-rel'), 'new_status_labels' => Array('c-rel'=>"!la_title_Adding_Relationship! '!la_title_New_Relationship!'"), 'edit_status_labels' => Array('c-rel'=>'!la_title_Editing_Relationship!'), 'format' => "#c_status# '#c_titlefield#' - #c-rel_status#", ), - + 'tree_site' => Array('format' => '!la_selecting_categories!'), ), - + 'PermItemPrefix' => 'CATEGORY', - + 'PermSection' => Array('main' => 'CATEGORY:in-portal:categories', /*'search' => 'in-portal:configuration_search',*/ 'email' => 'in-portal:configuration_email', 'custom' => 'in-portal:configuration_custom'), - + 'Sections' => Array( // "Structure & Data" section 'in-portal:site' => Array( @@ -107,7 +107,7 @@ 'in-portal:browse_new' => Array( 'parent' => 'in-portal:site', 'icon' => 'catalog', - 'label' => 'la_K4_Catalog', + 'label' => 'la_tab_Browse', 'url' => Array('t' => 'catalog', 'pass' => 'm'), 'late_load' => Array('t' => 'xml/tree_categories', 'pass' => 'm', 'm_cat_id' => 0), 'onclick' => 'checkCatalog(0)', @@ -118,14 +118,14 @@ 'in-portal:advanced_view_new' => Array( 'parent' => 'in-portal:site', 'icon' => 'advanced_view', - 'label' => 'la_K4_AdvancedView', + 'label' => 'la_tab_AdvancedView', 'url' => Array('t' => 'advanced_view', 'pass' => 'm'), 'permissions' => Array('view'), 'priority' => 0.2, 'type' => stTREE, ), - - 'in-portal:browse' => Array( + + /*'in-portal:browse' => Array( 'parent' => 'in-portal:site', 'icon' => 'catalog', 'label' => 'la_tab_Browse', @@ -134,7 +134,7 @@ 'priority' => 1, 'type' => stTREE, ), - + 'in-portal:advanced_view' => Array( 'parent' => 'in-portal:site', 'icon' => 'advanced_view', @@ -143,7 +143,7 @@ 'permissions' => Array('view'), 'priority' => 2, 'type' => stTREE, - ), + ),*/ 'in-portal:reviews' => Array( 'parent' => 'in-portal:site', Index: branches/unlabeled/unlabeled-1.4.2/core/units/general/helpers/mod_rewrite_helper.php =================================================================== diff -u -r5942 -r5970 --- branches/unlabeled/unlabeled-1.4.2/core/units/general/helpers/mod_rewrite_helper.php (.../mod_rewrite_helper.php) (revision 5942) +++ branches/unlabeled/unlabeled-1.4.2/core/units/general/helpers/mod_rewrite_helper.php (.../mod_rewrite_helper.php) (revision 5970) @@ -183,8 +183,8 @@ $query = 'SELECT ccd.l1_cust_'.$item_template_field_id.', FIND_IN_SET(c.CategoryId, '.$this->Conn->qstr($parent_path).') AS Ord1, c.CategoryId, c.Name, ccd.l1_cust_'.$item_template_field_id.' - FROM inp_Category AS c - LEFT JOIN inp_CategoryCustomData AS ccd + FROM '.TABLE_PREFIX.'Category AS c + LEFT JOIN '.TABLE_PREFIX.'CategoryCustomData AS ccd ON ccd.ResourceId = c.ResourceId WHERE c.CategoryId IN ('.$parent_path.') AND ccd.l1_cust_'.$item_template_field_id.' != \'\' ORDER BY FIND_IN_SET(c.CategoryId, '.$this->Conn->qstr($parent_path).') DESC'; Index: branches/unlabeled/unlabeled-1.4.2/kernel/units/general/helpers/mod_rewrite_helper.php =================================================================== diff -u -r5942 -r5970 --- branches/unlabeled/unlabeled-1.4.2/kernel/units/general/helpers/mod_rewrite_helper.php (.../mod_rewrite_helper.php) (revision 5942) +++ branches/unlabeled/unlabeled-1.4.2/kernel/units/general/helpers/mod_rewrite_helper.php (.../mod_rewrite_helper.php) (revision 5970) @@ -183,8 +183,8 @@ $query = 'SELECT ccd.l1_cust_'.$item_template_field_id.', FIND_IN_SET(c.CategoryId, '.$this->Conn->qstr($parent_path).') AS Ord1, c.CategoryId, c.Name, ccd.l1_cust_'.$item_template_field_id.' - FROM inp_Category AS c - LEFT JOIN inp_CategoryCustomData AS ccd + FROM '.TABLE_PREFIX.'Category AS c + LEFT JOIN '.TABLE_PREFIX.'CategoryCustomData AS ccd ON ccd.ResourceId = c.ResourceId WHERE c.CategoryId IN ('.$parent_path.') AND ccd.l1_cust_'.$item_template_field_id.' != \'\' ORDER BY FIND_IN_SET(c.CategoryId, '.$this->Conn->qstr($parent_path).') DESC'; Index: branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/changelog_1_2_1.txt =================================================================== diff -u --- branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/changelog_1_2_1.txt (revision 0) +++ branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/changelog_1_2_1.txt (revision 5970) @@ -0,0 +1,261 @@ +File in-portal/globals.php changed +File in-portal/index.php changed +File in-portal/admin/.cvsignore changed +File in-portal/admin/install.php changed +File in-portal/admin/backup/export1.php is removed; release_1_2_0 revision 1.5.32.1 +File in-portal/admin/backup/restore3.php changed +File in-portal/admin/browse/fw_menu.js changed +File in-portal/admin/category/addcategory_permissions.php changed +File in-portal/admin/category/category_maint.php changed +File in-portal/admin/category/permcacheupdate.php changed +File in-portal/admin/config/edit_label.php changed +File in-portal/admin/editor/inp_fckconfig.js changed +File in-portal/admin/editor/inp_styles.xml changed +File in-portal/admin/editor/FCKeditor/fckeditor.php changed +File in-portal/admin/email/do_send.php changed +File in-portal/admin/help/help.php changed +File in-portal/admin/import/step2.php changed +File in-portal/admin/import/step4.php changed +File in-portal/admin/include/sections.php changed +File in-portal/admin/include/style.css changed +File in-portal/admin/install/inportal_data.sql changed +File in-portal/admin/install/inportal_schema.sql changed +File in-portal/admin/install/install_lib.php changed +File in-portal/admin/install/restore_run.php changed +File in-portal/admin/install/langpacks/english.lang changed +File in-portal/admin/install/upgrades/inportal_upgrade_v1.2.1.php is new; release_1_2_1 revision 1.4.2.1 +File in-portal/admin/install/upgrades/inportal_upgrade_v1.2.1.sql is new; release_1_2_1 revision 1.8.2.3 +File in-portal/admin/modules/addmodule.php changed +File in-portal/admin/users/group_select.php changed +File in-portal/kernel/action.php changed +File in-portal/kernel/constants.php changed +File in-portal/kernel/frontaction.php changed +File in-portal/kernel/parser.php changed +File in-portal/kernel/admin/include/navmenu.php changed +File in-portal/kernel/admin/include/parser.php changed +File in-portal/kernel/admin/include/help/editcategory_custom.txt is removed; release_1_2_0 revision 1.1 +File in-portal/kernel/admin/include/help/editcategory_general.txt is removed; release_1_2_0 revision 1.3 +File in-portal/kernel/admin/include/help/editcategory_images.txt is removed; release_1_2_0 revision 1.1 +File in-portal/kernel/admin/include/help/editcategory_items.txt is removed; release_1_2_0 revision 1.1.2.1 +File in-portal/kernel/admin/include/help/editcategory_permissions.txt is removed; release_1_2_0 revision 1.1 +File in-portal/kernel/admin/include/help/editcategory_relations.txt is removed; release_1_2_0 revision 1.1 +File in-portal/kernel/admin/include/toolbar/advanced_view.php changed +File in-portal/kernel/admin/include/toolbar/browse.php changed +File in-portal/kernel/admin/include/toolbar/editcategory_relationselect.php changed +File in-portal/kernel/admin_templates/advanced_view.tpl is new; release_1_2_1 revision 1.1.2.7 +File in-portal/kernel/admin_templates/catalog.tpl is new; release_1_2_1 revision 1.23.2.11 +File in-portal/kernel/admin_templates/catalog_tab.tpl is new; release_1_2_1 revision 1.1.2.4 +File in-portal/kernel/admin_templates/category_selector.tpl is removed; release_1_2_0 revision 1.13 +File in-portal/kernel/admin_templates/help.tpl changed +File in-portal/kernel/admin_templates/index.tpl changed +File in-portal/kernel/admin_templates/tree.tpl changed +File in-portal/kernel/admin_templates/user_selector.tpl changed +File in-portal/kernel/admin_templates/categories/cache_updater.tpl is new; release_1_2_1 revision 1.7 +File in-portal/kernel/admin_templates/categories/categories_edit.tpl is new; release_1_2_1 revision 1.2 +File in-portal/kernel/admin_templates/categories/categories_edit_custom.tpl is new; release_1_2_1 revision 1.2 +File in-portal/kernel/admin_templates/categories/categories_edit_images.tpl is new; release_1_2_1 revision 1.2 +File in-portal/kernel/admin_templates/categories/categories_edit_permissions.tpl is new; release_1_2_1 revision 1.8.2.4 +File in-portal/kernel/admin_templates/categories/categories_edit_properties.tpl is new; release_1_2_1 revision 1.2 +File in-portal/kernel/admin_templates/categories/categories_edit_relations.tpl is new; release_1_2_1 revision 1.1.2.3 +File in-portal/kernel/admin_templates/categories/categories_tabs.tpl is new; release_1_2_1 revision 1.2.2.2 +File in-portal/kernel/admin_templates/categories/ci_blocks.tpl is new; release_1_2_1 revision 1.3.2.2 +File in-portal/kernel/admin_templates/categories/images_edit.tpl is new; release_1_2_1 revision 1.2 +File in-portal/kernel/admin_templates/categories/permissions_tab.tpl is new; release_1_2_1 revision 1.6.2.1 +File in-portal/kernel/admin_templates/categories/relations_edit.tpl is new; release_1_2_1 revision 1.1.2.2 +File in-portal/kernel/admin_templates/category/category_items.tpl is removed; release_1_2_0 revision 1.2 +File in-portal/kernel/admin_templates/config/config_email.tpl changed +File in-portal/kernel/admin_templates/config/config_general.tpl changed +File in-portal/kernel/admin_templates/config/config_universal.tpl changed +File in-portal/kernel/admin_templates/custom_fields/custom_fields_list.tpl changed +File in-portal/kernel/admin_templates/groups/groups_edit_permissions.tpl changed +File in-portal/kernel/admin_templates/groups/groups_edit_users.tpl changed +File in-portal/kernel/admin_templates/groups/permissions_selector.tpl changed +File in-portal/kernel/admin_templates/img/ajax_progress.gif is new; release_1_2_1 revision 1.1 +File in-portal/kernel/admin_templates/img/favicon.ico is new; release_1_2_1 revision 1.1 +File in-portal/kernel/admin_templates/img/perm_green.gif is new; release_1_2_1 revision 1.1 +File in-portal/kernel/admin_templates/img/perm_red.gif is new; release_1_2_1 revision 1.1 +File in-portal/kernel/admin_templates/img/progress_done.gif is new; release_1_2_1 revision 1.1 +File in-portal/kernel/admin_templates/img/progress_left.gif is new; release_1_2_1 revision 1.1 +File in-portal/kernel/admin_templates/img/icons/icon46_advanced_view.gif is new; release_1_2_1 revision 1.1.2.1 +File in-portal/kernel/admin_templates/img/itemtabs/divider_dn.gif is removed; release_1_2_0 revision 1.2 +File in-portal/kernel/admin_templates/img/itemtabs/divider_down.gif is new; release_1_2_1 revision 1.1 +File in-portal/kernel/admin_templates/img/itemtabs/tab_active.gif is removed; release_1_2_0 revision 1.2 +File in-portal/kernel/admin_templates/img/itemtabs/tab_inactive.gif is removed; release_1_2_0 revision 1.2 +File in-portal/kernel/admin_templates/img/itemtabs/tab_left.gif is new; release_1_2_1 revision 1.1 +File in-portal/kernel/admin_templates/img/itemtabs/tab_middle.gif is new; release_1_2_1 revision 1.1 +File in-portal/kernel/admin_templates/img/itemtabs/tab_right.gif is new; release_1_2_1 revision 1.1 +File in-portal/kernel/admin_templates/img/toolbar/tool_clear_clipboard.gif is new; release_1_2_1 revision 1.1.2.1 +File in-portal/kernel/admin_templates/img/toolbar/tool_clear_clipboard_f2.gif is new; release_1_2_1 revision 1.1.2.1 +File in-portal/kernel/admin_templates/img/toolbar/tool_clear_clipboard_f3.gif is new; release_1_2_1 revision 1.1.2.1 +File in-portal/kernel/admin_templates/img/toolbar/tool_export.gif is new; release_1_2_1 revision 1.1 +File in-portal/kernel/admin_templates/img/toolbar/tool_export_f2.gif is new; release_1_2_1 revision 1.1 +File in-portal/kernel/admin_templates/img/toolbar/tool_export_f3.gif is new; release_1_2_1 revision 1.1 +File in-portal/kernel/admin_templates/img/toolbar/tool_new_discount.gif is removed; release_1_2_0 revision 1.2 +File in-portal/kernel/admin_templates/img/toolbar/tool_new_discount_f2.gif is removed; release_1_2_0 revision 1.2 +File in-portal/kernel/admin_templates/img/toolbar/tool_new_listing.gif is removed; release_1_2_0 revision 1.2 +File in-portal/kernel/admin_templates/img/toolbar/tool_new_listing_f2.gif is removed; release_1_2_0 revision 1.2 +File in-portal/kernel/admin_templates/img/toolbar/tool_new_listing_type.gif is removed; release_1_2_0 revision 1.2 +File in-portal/kernel/admin_templates/img/toolbar/tool_new_listing_type_f2.gif is removed; release_1_2_0 revision 1.2 +File in-portal/kernel/admin_templates/img/toolbar/tool_pdf.gif is new; release_1_2_1 revision 1.1.4.1 +File in-portal/kernel/admin_templates/img/toolbar/tool_pdf_f2.gif is new; release_1_2_1 revision 1.1.4.1 +File in-portal/kernel/admin_templates/img/toolbar/tool_pdf_f3.gif is new; release_1_2_1 revision 1.1.4.1 +File in-portal/kernel/admin_templates/img/toolbar/tool_rebuild_cache.gif is new; release_1_2_1 revision 1.1 +File in-portal/kernel/admin_templates/img/toolbar/tool_rebuild_cache_f2.gif is new; release_1_2_1 revision 1.1 +File in-portal/kernel/admin_templates/incs/ajax.js is new; release_1_2_1 revision 1.15.2.4 +File in-portal/kernel/admin_templates/incs/blocks.tpl changed +File in-portal/kernel/admin_templates/incs/catalog.js is new; release_1_2_1 revision 1.27.2.12 +File in-portal/kernel/admin_templates/incs/close_popup.tpl changed +File in-portal/kernel/admin_templates/incs/config_blocks.tpl changed +File in-portal/kernel/admin_templates/incs/custom_blocks.tpl changed +File in-portal/kernel/admin_templates/incs/export.js is removed; release_1_2_0 revision 1.3.10.1 +File in-portal/kernel/admin_templates/incs/footer.tpl changed +File in-portal/kernel/admin_templates/incs/form_blocks.tpl changed +File in-portal/kernel/admin_templates/incs/fw_menu.js changed +File in-portal/kernel/admin_templates/incs/grid.js changed +File in-portal/kernel/admin_templates/incs/grid_blocks.tpl changed +File in-portal/kernel/admin_templates/incs/header.tpl changed +File in-portal/kernel/admin_templates/incs/image_blocks.tpl changed +File in-portal/kernel/admin_templates/incs/script.js changed +File in-portal/kernel/admin_templates/incs/style.css changed +File in-portal/kernel/admin_templates/incs/tab_blocks.tpl changed +File in-portal/kernel/admin_templates/incs/toolbar.js changed +File in-portal/kernel/admin_templates/incs/tree.js changed +File in-portal/kernel/admin_templates/item_selector/item_selector_advanced_view.tpl is new; release_1_2_1 revision 1.1.2.2 +File in-portal/kernel/admin_templates/item_selector/item_selector_catalog.tpl is new; release_1_2_1 revision 1.1.2.1 +File in-portal/kernel/admin_templates/item_selector/item_selector_tabs.tpl is new; release_1_2_1 revision 1.1.2.2 +File in-portal/kernel/admin_templates/item_selector/item_selector_toolbar.tpl is new; release_1_2_1 revision 1.1.2.3 +File in-portal/kernel/admin_templates/modules/modules_list.tpl changed +File in-portal/kernel/admin_templates/popups/editor.tpl is new; release_1_2_1 revision 1.1.2.1 +File in-portal/kernel/admin_templates/popups/translator.tpl changed +File in-portal/kernel/admin_templates/regional/languages_edit_email_events.tpl changed +File in-portal/kernel/admin_templates/regional/languages_edit_phrases.tpl changed +File in-portal/kernel/admin_templates/regional/languages_list.tpl changed +File in-portal/kernel/admin_templates/stylesheets/stylesheets_list.tpl changed +File in-portal/kernel/admin_templates/tools/system_tools.tpl is new; release_1_2_1 revision 1.1.2.1 +File in-portal/kernel/admin_templates/xml/cache_updater.tpl is new; release_1_2_1 revision 1.1 +File in-portal/kernel/admin_templates/xml/categories_list.tpl is new; release_1_2_1 revision 1.15.2.8 +File in-portal/kernel/admin_templates/xml/tree_categories.tpl changed +File in-portal/kernel/include/category.php changed +File in-portal/kernel/include/config.php changed +File in-portal/kernel/include/customfield.php changed +File in-portal/kernel/include/db.class.php changed +File in-portal/kernel/include/emailmessage.php changed +File in-portal/kernel/include/item.php changed +File in-portal/kernel/include/modules.php changed +File in-portal/kernel/include/parseditem.php changed +File in-portal/kernel/include/usersession.php changed +File in-portal/kernel/include/adodb/adodb.inc.php changed +File in-portal/kernel/module_help/categories_custom.txt is new; release_1_2_1 revision 1.1.2.1 +File in-portal/kernel/module_help/categories_edit.txt is new; release_1_2_1 revision 1.1.2.1 +File in-portal/kernel/module_help/categories_images.txt is new; release_1_2_1 revision 1.1.2.1 +File in-portal/kernel/module_help/categories_permissions.txt is new; release_1_2_1 revision 1.1.2.1 +File in-portal/kernel/module_help/categories_properties.txt is new; release_1_2_1 revision 1.1.2.1 +File in-portal/kernel/module_help/categories_relations.txt is new; release_1_2_1 revision 1.1.2.1 +File in-portal/kernel/units/admin/admin_config.php changed +File in-portal/kernel/units/admin/admin_events_handler.php is new; release_1_2_1 revision 1.1.2.1 +File in-portal/kernel/units/admin/admin_tag_processor.php changed +File in-portal/kernel/units/categories/cache_updater.php is new; release_1_2_1 revision 1.6.2.6 +File in-portal/kernel/units/categories/categories_config.php changed +File in-portal/kernel/units/categories/categories_event_handler.php changed +File in-portal/kernel/units/categories/categories_item.php changed +File in-portal/kernel/units/categories/categories_tag_processor.php changed +File in-portal/kernel/units/category_items/category_items_config.php changed +File in-portal/kernel/units/category_items/category_items_event_handler.php changed +File in-portal/kernel/units/category_items/category_items_tag_processor.php changed +File in-portal/kernel/units/config_search/config_search_config.php changed +File in-portal/kernel/units/config_search/config_search_event_handler.php changed +File in-portal/kernel/units/configuration/configuration_config.php changed +File in-portal/kernel/units/configuration/configuration_event_handler.php changed +File in-portal/kernel/units/configuration/configuration_tag_processor.php changed +File in-portal/kernel/units/custom_fields/custom_fields_config.php changed +File in-portal/kernel/units/custom_fields/custom_fields_tag_processor.php changed +File in-portal/kernel/units/email_events/email_events_event_handler.php changed +File in-portal/kernel/units/general/cat_dbitem.php changed +File in-portal/kernel/units/general/cat_dbitem_export.php changed +File in-portal/kernel/units/general/cat_event_handler.php changed +File in-portal/kernel/units/general/cat_tag_processor.php changed +File in-portal/kernel/units/general/custom_fields.php changed +File in-portal/kernel/units/general/general_config.php changed +File in-portal/kernel/units/general/inp1_parser.php changed +File in-portal/kernel/units/general/inp_db_event_handler.php changed +File in-portal/kernel/units/general/main_event_handler.php changed +File in-portal/kernel/units/general/my_application.php changed +File in-portal/kernel/units/general/xml_helper.php changed +File in-portal/kernel/units/general/helpers/clipboard_helper.php is new; release_1_2_1 revision 1.1.2.2 +File in-portal/kernel/units/general/helpers/filenames_helper.php is new; release_1_2_1 revision 1.2 +File in-portal/kernel/units/general/helpers/helpers_config.php is new; release_1_2_1 revision 1.2.2.1 +File in-portal/kernel/units/general/helpers/mod_rewrite_helper.php changed +File in-portal/kernel/units/general/helpers/modules.php changed +File in-portal/kernel/units/general/helpers/permissions_helper.php changed +File in-portal/kernel/units/general/helpers/recursive_helper.php is new; release_1_2_1 revision 1.2.2.6 +File in-portal/kernel/units/general/helpers/sections_helper.php changed +File in-portal/kernel/units/groups/groups_config.php changed +File in-portal/kernel/units/help/help_tag_processor.php changed +File in-portal/kernel/units/images/image_tag_processor.php changed +File in-portal/kernel/units/images/images_config.php changed +File in-portal/kernel/units/languages/languages_config.php changed +File in-portal/kernel/units/languages/languages_event_handler.php changed +File in-portal/kernel/units/languages/languages_item.php changed +File in-portal/kernel/units/modules/modules_config.php changed +File in-portal/kernel/units/permissions/permissions_config.php changed +File in-portal/kernel/units/permissions/permissions_event_handler.php changed +File in-portal/kernel/units/permissions/permissions_tag_processor.php changed +File in-portal/kernel/units/phrases/phrases_config.php changed +File in-portal/kernel/units/phrases/phrases_event_handler.php changed +File in-portal/kernel/units/relationship/relationship_config.php changed +File in-portal/kernel/units/relationship/relationship_event_handler.php changed +File in-portal/kernel/units/reviews/reviews_config.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/stylesheets/stylesheets_config.php changed +File in-portal/kernel/units/stylesheets/stylesheets_event_handler.php changed +File in-portal/kernel/units/themes/themes_config.php changed +File in-portal/kernel/units/users/users_event_handler.php changed +File in-portal/kernel/units/users/users_tag_processor.php changed +File in-portal/kernel/units/visits/visits_config.php changed +File in-portal/kernel/units/visits/visits_list.php is new; release_1_2_1 revision 1.1.2.1 +File kernel4_dev/kernel4/application.php changed +File kernel4_dev/kernel4/event_handler.php changed +File kernel4_dev/kernel4/event_manager.php changed +File kernel4_dev/kernel4/kbase.php changed +File kernel4_dev/kernel4/startup.php changed +File kernel4_dev/kernel4/db/db_connection.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/languages/phrases_cache.php changed +File kernel4_dev/kernel4/parser/construct_tags.php changed +File kernel4_dev/kernel4/parser/tags.php changed +File kernel4_dev/kernel4/parser/template.php changed +File kernel4_dev/kernel4/parser/template_parser.php changed +File kernel4_dev/kernel4/processors/main_processor.php changed +File kernel4_dev/kernel4/processors/tag_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 changed +File kernel4_dev/kernel4/utility/event.php changed +File kernel4_dev/kernel4/utility/factory.php changed +File kernel4_dev/kernel4/utility/params.php changed +File kernel4_dev/kernel4/utility/temp_handler.php changed +File kernel4_dev/kernel4/utility/unit_config_reader.php changed +File kernel4_dev/kernel4/utility/debugger/debugger.css changed +File kernel4_dev/kernel4/utility/debugger/debugger.js changed +File kernel4_dev/kernel4/utility/debugger/debugger_responce.php changed +File kernel4_dev/kernel4/utility/formatters/multilang_formatter.php changed +File kernel4_dev/kernel4/utility/formatters/upload_formatter.php changed +File cmseditor/fckconfig.js changed +File cmseditor/fckeditor.php changed +File cmseditor/editor/filemanager/browser/default/browser.html changed +File cmseditor/editor/filemanager/browser/default/frmresourceslist.html changed +File cmseditor/editor/filemanager/browser/default/frmupload.html changed +File cmseditor/editor/filemanager/browser/default/connectors/php/commands.php changed +File cmseditor/editor/filemanager/browser/default/connectors/php/config.php changed +File cmseditor/editor/filemanager/browser/default/connectors/php/connector.php changed +File cmseditor/editor/filemanager/browser/default/images/blackpix.gif is new; release_1_2_1 revision 1.1 +File cmseditor/editor/filemanager/browser/default/js/fckxml.js changed + + +Changes in phrases and events: + + Index: branches/unlabeled/unlabeled-1.1.2/core/kernel/utility/formatters/multilang_formatter.php =================================================================== diff -u -r5634 -r5970 --- branches/unlabeled/unlabeled-1.1.2/core/kernel/utility/formatters/multilang_formatter.php (.../multilang_formatter.php) (revision 5634) +++ branches/unlabeled/unlabeled-1.1.2/core/kernel/utility/formatters/multilang_formatter.php (.../multilang_formatter.php) (revision 5970) @@ -4,7 +4,7 @@ { /** - * Returns ML field equivalent to field name specifed + * Returns ML field equivalent to field name specifed * * @param string $field_name * @param bool $from_primary use primary/current language for name custruction @@ -13,6 +13,7 @@ function LangFieldName($field_name, $from_primary = false) { $lang = $from_primary ? $this->Application->GetDefaultLanguageId() : $this->Application->GetVar('m_lang'); + if (!$lang) $lang = $this->Application->GetDefaultLanguageId(); return 'l'.$lang.'_'.$field_name; }