Project

General

Profile

« Previous | Next » 

Revision 1366

Added by Dietmar almost 14 years ago

fixed showing system_default for search_template

View differences:

branches/2.8.x/CHANGELOG
11 11
! = Update/Change
12 12

  
13 13
------------------------------------- 2.8.2 -------------------------------------
14
29 Dec-2010 Build 1366 Dietmar Woellbrink (Luisehahne)
15
# fixed showing system_default for search_template 
14 16
29 Dec-2010 Build 1365 Dietmar Woellbrink (Luisehahne)
15 17
! added some functions 
16 18
! set status to 2.8.2 RC3
branches/2.8.x/wb/admin/interface/version.php
52 52

  
53 53
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
54 54
if(!defined('VERSION')) define('VERSION', '2.8.2.RC3');
55
if(!defined('REVISION')) define('REVISION', '1365');
55
if(!defined('REVISION')) define('REVISION', '1366');
56 56

  
57 57
?>
branches/2.8.x/wb/admin/settings/index.php
293 293
	}
294 294

  
295 295
// Insert templates for search settings
296
	$search_template = ( ($search_template == DEFAULT_TEMPLATE) || ($search_template == '') ) ? DEFAULT_TEMPLATE : $search_template;
296
	$search_template = ( ($search_template == DEFAULT_TEMPLATE) || ($search_template == '') ) ? '' : $search_template;
297 297
	$selected = ( ($search_template != DEFAULT_TEMPLATE) ) ?  ' selected="selected"' : $selected = '';
298 298

  
299 299
	$template->set_var(array(
......
301 301
	        'NAME' => $TEXT['SYSTEM_DEFAULT'],
302 302
	        'SELECTED' => $selected
303 303
	    ));
304
	$template->parse('search_template_list', 'search_template_list_block', true);
304 305

  
305 306
	$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'template' AND function = 'template' ORDER BY name");
306 307
	if($result->numRows() > 0)

Also available in: Unified diff