Project

General

Profile

« Previous | Next » 

Revision 854

Added by thorn over 16 years ago

fixed an issues related to search, changed one SQL inner join (to use USING instead of WHERE, added $database = new Database(); in front of output-filter

View differences:

trunk/CHANGELOG
11 11 
! = Update/Change
12 12 

  		




  13
  13
  
    
------------------------------------- 2.7.1 -------------------------------------


  		




  
  14
  
    
25-Jul-2008 Thomas Hornik


  		




  
  15
  
    
# fixed an issues related to search, changed one SQL inner join (to use USING instead of WHERE)


  		




  
  16
  
    
! added $database = new Database(); in front of output-filter


  		




  14
  17
  
    
05-Jul-2008 Thomas Hornik


  		




  15
  18
  
    
# fixed MODI_DATE/PUBLISHED_DATE issue in news-module. Added PUBLISHED_TIME, removed PUBL_DATE,PUBL_TIME. Thanks to forum-member timorotha


  		




  16
  19
  
    
02-Jul-2008 Christian Sommer


  		












  

    
      trunk/wb/framework/class.frontend.php
    
  





  88
  88
  
    
		$table_s = TABLE_PREFIX.'sections';


  		




  89
  89
  
    
		$now = time();


  		




  90
  90
  
    
		$query_default = "


  		




  91
  
  
    
			SELECT p.page_id, p.link


  		




  92
  
  
    
			FROM $table_p AS p, $table_s AS s


  		




  93
  
  
    
			WHERE p.page_id=s.page_id


  		




  94
  
  
    
			AND p.parent = '0' AND p.visibility = 'public'


  		




  95
  
  
    
			AND (($now>=s.publ_start OR s.publ_start=0) AND ($now<=s.publ_end OR s.publ_end=0))


  		




  
  91
  
    
			SELECT `p`.`page_id`, `link`


  		




  
  92
  
    
			FROM `$table_p` AS `p` INNER JOIN `$table_s` USING(`page_id`)


  		




  
  93
  
    
			WHERE `parent` = '0' AND `visibility` = 'public'


  		




  
  94
  
    
			AND (($now>=`publ_start` OR `publ_start`=0) AND ($now<=`publ_end` OR `publ_end`=0))


  		




  96
  95
  
    
			$this->sql_where_language


  		




  97
  
  
    
			ORDER BY p.position ASC LIMIT 1";


  		




  
  96
  
    
			ORDER BY `p`.`position` ASC LIMIT 1";


  		




  98
  97
  
    
		$get_default = $database->query($query_default);


  		




  99
  98
  
    
		$default_num_rows = $get_default->numRows();


  		




  100
  99
  
    
		if(!isset($page_id) OR !is_numeric($page_id)){


  		












  

    
      trunk/wb/index.php
    
  





  87
  87
  
    
}


  		




  88
  88
  
    

  		




  89
  89
  
    
if(file_exists(WB_PATH .'/modules/output_filter/filter-routines.php')) {


  		




  
  90
  
    
	// reconnect to database


  		




  
  91
  
    
	$database = new database();


  		




  90
  92
  
    
	// include the output filter module routines


  		




  91
  93
  
    
	@require_once(WB_PATH .'/modules/output_filter/filter-routines.php');


  		




  92
  94
  
    
	


  		












  

    
      trunk/wb/search/search.php
    
  





  525
  525
  
    
	if($cfg_enable_old_search) { // this is the old (wb <= 2.6.7) search-function


  		




  526
  526
  
    
		$search_path_SQL = str_replace(' link ', ' '.TABLE_PREFIX.'pages.link ', $search_path_SQL);


  		




  527
  527
  
    
		foreach($sorted_modules AS $module) {


  		




  
  528
  
    
			if(isset($seen_pages[$module['value']]) && count($seen_pages[$module['value']])>0) // skip modules handled by new search-func


  		




  
  529
  
    
				continue;


  		




  528
  530
  
    
			$query_start = '';


  		




  529
  531
  
    
			$query_body = '';


  		




  530
  532
  
    
			$query_end = '';


  		












Also available in:  Unified diff