Index: trunk/core/kernel/application.php =================================================================== diff -u -N -r2432 -r2556 --- trunk/core/kernel/application.php (.../application.php) (revision 2432) +++ trunk/core/kernel/application.php (.../application.php) (revision 2556) @@ -199,7 +199,7 @@ $module =& $this->recallObject('mod'); $this->setUnitOption('mod','AutoLoad',true); - if( $module->Load('In-Commerce') ) + if( $module->Load('In-Commerce') && $module->GetDBField('Loaded') == 1 ) { $table = $this->getUnitOption('curr','TableName'); return $this->DB->GetOne('SELECT ISO FROM '.$table.' WHERE IsPrimary = 1'); Index: trunk/admin/images/toolbar/tool_clear_selected_f2.gif =================================================================== diff -u -N Binary files differ Index: trunk/admin/images/toolbar/tool_clear_selected.gif =================================================================== diff -u -N Binary files differ Index: trunk/admin/images/toolbar/tool_clear_selected_f3.gif =================================================================== diff -u -N Binary files differ Index: trunk/admin/install/upgrades/readme_1_1_2.txt =================================================================== diff -u -N -r2552 -r2556 --- trunk/admin/install/upgrades/readme_1_1_2.txt (.../readme_1_1_2.txt) (revision 2552) +++ trunk/admin/install/upgrades/readme_1_1_2.txt (.../readme_1_1_2.txt) (revision 2556) @@ -1,2 +1,3 @@ 0008623 - Errors are not shown on password reset screen in default theme. -0008641 - new tag added \ No newline at end of file +0008641 - new tag added +0008662 - "Delete All" button in search log in admin \ No newline at end of file Index: trunk/admin/logs/searchlog.php =================================================================== diff -u -N -r2536 -r2556 --- trunk/admin/logs/searchlog.php (.../searchlog.php) (revision 2536) +++ trunk/admin/logs/searchlog.php (.../searchlog.php) (revision 2556) @@ -116,12 +116,16 @@ "swap('log_refresh', 'toolbar/tool_refresh.gif');","window.location.reload(true);", "tool_refresh.gif", FALSE, TRUE); -$objListToolBar->Add("log_reset","la_ToolTip_Reset","#", "if (ListChecks.itemChecked()) swap('log_reset','toolbar/tool_reset_f2.gif');", - "if (ListChecks.itemChecked()) swap('log_reset', 'toolbar/tool_reset.gif');","if (ListChecks.itemChecked()) ListChecks.check_submit('searchlog','m_keyword_reset');", - "tool_reset.gif", TRUE, TRUE); +$objListToolBar->Add("log_reset","la_ToolTip_Delete","#", "if (ListChecks.itemChecked()) swap('log_reset','toolbar/tool_clear_selected_f2.gif');", + "if (ListChecks.itemChecked()) swap('log_reset', 'toolbar/tool_clear_selected.gif');","if (ListChecks.itemChecked()) ListChecks.check_submit('searchlog','m_keyword_reset');", + "tool_clear_selected.gif", TRUE, TRUE); -$listImages[] = "ListChecks.addImage('log_reset','$imagesURL/toolbar/tool_reset.gif','$imagesURL/toolbar/tool_reset_f3.gif',1); "; +$listImages[] = "ListChecks.addImage('log_reset','$imagesURL/toolbar/tool_clear_selected.gif','$imagesURL/toolbar/tool_clear_selected_f3.gif',1); "; +$objListToolBar->Add("log_clear", "la_ToolTip_DeleteAll","#","swap('log_clear','toolbar/tool_reset_f2.gif');", + "swap('log_clear', 'toolbar/tool_reset.gif');","ListChecks.check_submit('searchlog','m_clear_searchlog');", + "tool_reset.gif", FALSE, TRUE); + $objListToolBar->Add("divider"); $objListToolBar->Add("user_print", "la_ToolTip_Print","#","swap('user_print','toolbar/tool_print_f2.gif');", Index: trunk/kernel/action.php =================================================================== diff -u -N -r2519 -r2556 --- trunk/kernel/action.php (.../action.php) (revision 2519) +++ trunk/kernel/action.php (.../action.php) (revision 2556) @@ -1027,6 +1027,13 @@ $c->Delete(); } break; + + case 'm_clear_searchlog': + $objSearchList = new clsSearchLogList(); + $db =& GetADODBConnection(); + $db->Execute('DELETE FROM '.$objSearchList->SourceTable ); + break; + case "m_review_add": $post_info = GetSubmitVariable($_POST, 'EditStatus'); if($post_info['variable'] > -1)