Menu
▾
▴
[mxbb-commits] core/includes mx_functions_core.php,1.19,1.20 page_header.php,1.28,1.29
|
From: Jon O. <jon...@us...> - 2005-12-13 20:57:12
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21266/includes Modified Files: mx_functions_core.php page_header.php Log Message: further fixes for search - updated quick search dropdown in overall_header.tpl - automatically finding page_id to search target (site, kb, pafiledb) config/custom cache - included in regenerate cache and adminCP Index: page_header.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/page_header.php,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** page_header.php 9 Dec 2005 23:22:03 -0000 1.28 --- page_header.php 13 Dec 2005 20:57:02 -0000 1.29 *************** *** 193,199 **** $page_icon_img = ( !empty($mx_page->page_icon) && $mx_page->page_icon != 'none' ) ? '<img align="absmiddle" src="' . PORTAL_URL . TEMPLATE_ROOT_PATH . 'images/page_icons/' . $mx_page->page_icon . '" alt="" /> ' : ''; ! $option_search_site = '<option value="site">' . $lang['Mx_search_site'] . '</option>'; $option_search_forum = '<option value="forum">' . $lang['Mx_search_forum'] . '</option>'; ! $option_search_kb = file_exists($mx_root_path . 'modules/mx_kb/kb.php') ? '<option value="kb">' . $lang['Mx_search_kb'] . '</option>' : ''; $option_search_google = '<option value="google">' . $lang['Mx_search_google'] . '</option>'; --- 193,204 ---- $page_icon_img = ( !empty($mx_page->page_icon) && $mx_page->page_icon != 'none' ) ? '<img align="absmiddle" src="' . PORTAL_URL . TEMPLATE_ROOT_PATH . 'images/page_icons/' . $mx_page->page_icon . '" alt="" /> ' : ''; ! $search_page_id_pafiledb = get_page_id('dload.php', true); ! $search_page_id_kb = get_page_id('kb.php', true); ! $search_page_id_site = get_page_id('mx_search.php', true); ! ! $option_search_site = !empty($search_page_id_site) ? '<option value="site">' . $lang['Mx_search_site'] . '</option>' : ''; $option_search_forum = '<option value="forum">' . $lang['Mx_search_forum'] . '</option>'; ! $option_search_kb = !empty($search_page_id_kb) ? '<option value="kb">' . $lang['Mx_search_kb'] . '</option>' : ''; ! $option_search_pafiledb = !empty($search_page_id_pafiledb) ? '<option value="pafiledb">' . $lang['Mx_search_pafiledb'] . '</option>' : ''; $option_search_google = '<option value="google">' . $lang['Mx_search_google'] . '</option>'; *************** *** 263,268 **** 'U_INDEX_FORUM' => append_sid(PORTAL_URL . 'index.' . $phpEx . '?page=2'), 'U_INDEX' => append_sid(PORTAL_URL . 'index.' . $phpEx), ! 'U_SEARCH_SITE' => append_sid(PORTAL_URL . "modules/mx_coreblocks/mx_search.$phpEx?mode=results&search_terms=all"), ! 'U_SEARCH_KB' => append_sid(PORTAL_URL . "modules/mx_kb/kb_search.$phpEx?mode=results&search_terms=all"), 'PAGE_ICON' => $page_icon_img, --- 268,274 ---- 'U_INDEX_FORUM' => append_sid(PORTAL_URL . 'index.' . $phpEx . '?page=2'), 'U_INDEX' => append_sid(PORTAL_URL . 'index.' . $phpEx), ! 'U_SEARCH_SITE' => append_sid(PORTAL_URL . 'index.' . $phpEx . '?page=' . $search_page_id_site . '&mode=results&search_terms=all'), ! 'U_SEARCH_KB' => append_sid(PORTAL_URL . 'index.' . $phpEx . '?page=' . $search_page_id_kb . '&mode=search&search_terms=all'), ! 'U_SEARCH_PAFILEDB' => append_sid(PORTAL_URL . 'index.' . $phpEx . '?page=' . $search_page_id_pafiledb . '&action=search&search_terms=all'), 'PAGE_ICON' => $page_icon_img, *************** *** 270,273 **** --- 276,280 ---- 'L_SEARCH_FORUM' => $option_search_forum, 'L_SEARCH_KB' => $option_search_kb, + 'L_SEARCH_PAFILEDB' => $option_search_pafiledb, 'L_SEARCH_GOOGLE' => $option_search_google, //- MX System Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** mx_functions_core.php 11 Dec 2005 16:13:39 -0000 1.19 --- mx_functions_core.php 13 Dec 2005 20:57:02 -0000 1.20 *************** *** 734,737 **** --- 734,739 ---- function update( $type = MX_CACHE_ALL, $id = '' ) { + global $mx_config_cache; + if ( $type == MX_CACHE_ALL && empty($id) ) { *************** *** 756,759 **** --- 758,767 ---- } $this->_update_cache( ); + + // + // Now also clear the config/custom cache + // + $mx_config_cache->tidy(); + $mx_config_cache->unload(); } |
