Index: trunk/kernel/admin/include/toolbar/browse.php =================================================================== diff -u -N -r3642 -r3648 --- trunk/kernel/admin/include/toolbar/browse.php (.../browse.php) (revision 3642) +++ trunk/kernel/admin/include/toolbar/browse.php (.../browse.php) (revision 3648) @@ -278,9 +278,9 @@ k4_action = 'rebuild_cache("c")'; break; - case 'import': - k4_action = 'import_items("'+prefix_special+'")'; - break; +// case 'import': +// k4_action = 'import_items("'+prefix_special+'")'; +// break; case 'export': k4_action = 'export_items("'+prefix_special+'")'; @@ -322,11 +322,11 @@ submit_event(prefix_special,'OnMassDecline','') } - function import_items(prefix_special) - { - set_hidden_field('remove_specials['+prefix_special+']',1); - submit_event(prefix_special,'OnImport','') - } +// function import_items(prefix_special) +// { +// set_hidden_field('remove_specials['+prefix_special+']',1); +// submit_event(prefix_special,'OnImport','') +// } function export_items(prefix_special) { @@ -425,7 +425,7 @@ AddButtonAction('approve',"check_submit('$admin/browse','approve');"); //approve AddButtonAction('decline',"check_submit('$admin/browse','decline');"); //decline - AddButtonAction('import',"check_submit('$admin/browse','import');"); // import +// AddButtonAction('import',"check_submit('$admin/browse','import');"); // import AddButtonAction('export',"check_submit('$admin/browse','export');"); // export AddButtonAction('rebuild_cache',"check_submit('$admin/category/category_maint', 'm_rebuild_cache');"); // rebuild_cache @@ -544,7 +544,10 @@ var isCatImportExport = activeTab && isAnyChecked('categories') && (actionValue == 'import' || actionValue == 'export'); - if (activeTab && (!isAnyChecked('categories') || isCatImportExport)) + // skip news & topics for export operations (not to raise js errors) + var allowProcessing = (activeTab.getAttribute("PrefixSpecial") != 'n' && activeTab.getAttribute("PrefixSpecial") != 'bb'); + + if (allowProcessing && activeTab && (!isAnyChecked('categories') || isCatImportExport)) { form_name = activeTab.id; action_prefix = activeTab.getAttribute("ActionPrefix"); @@ -562,7 +565,7 @@ eval(act); return; } - else if(actionValue == 'export' || actionValue == 'import') + else if(actionValue == 'export') // || actionValue == 'import' { return k4_actionHandler(actionValue, activeTab.getAttribute("PrefixSpecial")); }