Project

General

Profile

« Previous | Next » 

Revision 773

Added by thorn over 17 years ago

search: added missing vars to $search_func_vars[] for external search

View differences:

search.php
320 320 
	// call $search_funcs['__before'] first
321 321 
	$search_func_vars = array(
322 322 
		'database' => $database, // database-handle
323 
		'page_id' => 0,
324 
		'section_id' => 0,
325 
		'page_title' => '',
326 
		'page_menu_title' => '',
327 
		'page_description' => '',
328 
		'page_keywords' => '',
329 
		'page_link' => '',
330 
		'page_modified_when' => 0,
331 
		'page_modified_by' => 0,
323 332 
		'users' => $users, // array of known user-id/user-name
324 333 
		'search_words' => $search_words, // search-string, prepared for regex
325 334 
		'search_match' => $match, // match-type
326 335 
		'search_url_array' => $search_url_array, // original search-string. ATTN: string is not quoted!
327 336 
		'results_loop_string' => $fetch_results_loop['value'],
328 337 
		'default_max_excerpt' => $search_max_excerpt,
329 
		'time_limit' => $search_time_limit // time-limit in secs
338 
		'time_limit' => $search_time_limit, // time-limit in secs
339 
		'search_path' => $search_path // see docu
330 340 
	);
331 341 
	foreach($search_funcs['__before'] as $func) {
332 342 
		$uf_res = call_user_func($func, $search_func_vars);
......
404 414 
	// now call $search_funcs['__after']
405 415 
	$search_func_vars = array(
406 416 
		'database' => $database, // database-handle
417 
		'page_id' => 0,
418 
		'section_id' => 0,
419 
		'page_title' => '',
420 
		'page_menu_title' => '',
421 
		'page_description' => '',
422 
		'page_keywords' => '',
423 
		'page_link' => '',
424 
		'page_modified_when' => 0,
425 
		'page_modified_by' => 0,
407 426 
		'users' => $users, // array of known user-id/user-name
408 427 
		'search_words' => $search_words, // search-string, prepared for regex
409 428 
		'search_match' => $match, // match-type
410 429 
		'search_url_array' => $search_url_array, // original search-string. ATTN: string is not quoted!
411 430 
		'results_loop_string' => $fetch_results_loop['value'],
412 431 
		'default_max_excerpt' => $search_max_excerpt,
413 
		'time_limit' => $search_time_limit // time-limit in secs
432 
		'time_limit' => $search_time_limit, // time-limit in secs
433 
		'search_path' => $search_path // see docu
414 434 
	);
415 435 
	foreach($search_funcs['__after'] as $func) {
416 436 
		$uf_res = call_user_func($func, $search_func_vars);

Also available in: Unified diff