diff options
| -rwxr-xr-x[-rw-r--r--] | cmd_line_reindex.php | 4 | ||||
| -rwxr-xr-x | includes/bit_setup_inc.php | 2 | ||||
| -rwxr-xr-x | includes/refresh.php | 3 | ||||
| -rwxr-xr-x | includes/refresh_functions.php | 5 |
4 files changed, 8 insertions, 6 deletions
diff --git a/cmd_line_reindex.php b/cmd_line_reindex.php index 648879c..887abd8 100644..100755 --- a/cmd_line_reindex.php +++ b/cmd_line_reindex.php @@ -46,7 +46,7 @@ $_SERVER['HTTP_USER_AGENT'] = 'batch'; require_once '../kernel/includes/setup_inc.php'; use Bitweaver\Liberty\LibertyBase; -require_once SEARCH_PKG_INCLUDES_PATH.'refresh_functions.php'; +require_once 'includes/refresh_functions.php'; $whatToIndex = "pages"; $unindexedOnly = false; @@ -70,7 +70,7 @@ if (isset($argc)) { // we are running from the command line. $time_start = microtime_float(); if (!$silent) echo "\nBeginning Reindex of $whatToIndex ...\n"; if (!$silent && $unindexedOnly) echo "Warning: unindexed only flag set. Will break MySQL 3.x because of sub-selects\n"; - $count = rebuild_index($whatToIndex, $unindexedOnly); + $count = \Bitweaver\Liberty\rebuild_index($whatToIndex, $unindexedOnly); $time_end = microtime_float(); $time = number_format($time_end - $time_start, 4); if (!$silent) echo "Index rebuild complete.\n"; diff --git a/includes/bit_setup_inc.php b/includes/bit_setup_inc.php index 554f3ae..ae4cfed 100755 --- a/includes/bit_setup_inc.php +++ b/includes/bit_setup_inc.php @@ -31,7 +31,7 @@ if( $gBitSystem->isPackageActive( 'search' ) ) { // But only if the Index On Submit isn't set if( ! $gBitSystem->isFeatureActive("search_index_on_submit") ) { include_once SEARCH_PKG_INCLUDE_PATH . 'refresh.php'; - register_shutdown_function("refresh_search_index"); + register_shutdown_function("\\Bitweaver\\Liberty\\refresh_search_index"); } include_once SEARCH_PKG_INCLUDE_PATH . 'refresh_functions.php'; $gLibertySystem->registerService( LIBERTY_SERVICE_SEARCH, SEARCH_PKG_NAME, diff --git a/includes/refresh.php b/includes/refresh.php index 7b6796d..1d55429 100755 --- a/includes/refresh.php +++ b/includes/refresh.php @@ -13,6 +13,7 @@ * @package search * @subpackage functions */ +namespace Bitweaver\Liberty; /** * refresh_search_index @@ -58,6 +59,6 @@ function refresh_search_index() { $gBitSystem->mDb->mDb->SelectDB( $gBitDbName ); if ( !empty ($key) ) - call_user_func( $key, $locs[$key] ); + \call_user_func( "\\Bitweaver\\Liberty\\$key", $locs[$key] ); } } diff --git a/includes/refresh_functions.php b/includes/refresh_functions.php index 50dfec7..488dad2 100755 --- a/includes/refresh_functions.php +++ b/includes/refresh_functions.php @@ -21,6 +21,7 @@ * With the exception of blogs (blog headers not blog posts) they pick the content_id * and pass it to refresh_index() to do the work. */ +namespace Bitweaver\Liberty; function random_refresh_index($pContentType = "") { global $gBitSystem; @@ -177,8 +178,8 @@ function rebuild_index($pContentType, $pUnindexedOnly = false) { while ($res = $result->fetchRow()) { if( isset( $gLibertySystem->mContentTypes[$res["content_type_guid"]] ) ) { $type = $gLibertySystem->mContentTypes[$res["content_type_guid"]]; - require_once constant( strtoupper( $type['handler_package'] ) . '_PKG_PATH' ) . $type['handler_file']; - $obj = new $type['handler_class']( null, $res["content_id"] ); + $full_class = '\Bitweaver\\'.ucfirst($type['handler_package']).'\\'.$type['handler_class']; + $obj = new $full_class( null, $res["content_id"] ); refresh_index($obj); unset($obj); } |