Project

General

Profile

« Previous | Next » 

Revision 1457

Added by Dietmar over 13 years ago

Preparing 2.8.2 stable, last tests

View differences:

settings.php
49 49
$old_admin_users = explode(',', $results_array['admin_users']);
50 50

  
51 51
// Work-out if we should check for existing page_code
52
$sql = 'DESCRIBE `'.TABLE_PREFIX.'pages` `page_code`';
53
$field_sql = $database->query($sql);
54
$field_set = $field_sql->numRows();
52
$field_set = $database->field_exists(TABLE_PREFIX.'pages', 'page_code');
55 53

  
56 54
$in_old_group = FALSE;
57 55
foreach($admin->get_groups_id() as $cur_gid)
......
411 409
			}
412 410
			// Title -'s prefix
413 411
			$title_prefix = '';
414
			for($i = 1; $i <= $page['level']; $i++) { $title_prefix .= ' - '; }
412
			for($i = 1; $i <= $page['level']; $i++) { $title_prefix .= ' - - &nbsp;'; }
415 413
			$template->set_var(array(
416 414
								'ID' => $page['page_id'],
417 415
								'TITLE' => ($title_prefix.$page['menu_title']),
......
540 538
		$l_names[$rec_language['name']] = entities_to_7bit($rec_language['name']); // sorting-problem workaround
541 539
	}
542 540
	asort($l_names);
541

  
543 542
	foreach($l_names as $l_name=>$v)
544 543
    {
544
        $langIcons = (empty($l_codes[$l_name])) ? 'none' : strtolower($l_codes[$l_name]);
545 545
		// Insert code and name
546 546
		$template->set_var(array(
547 547
								'VALUE' => $l_codes[$l_name],
548 548
								'NAME' => $l_name,
549
								'FLAG_LANG_ICONS' => 'url('.THEME_URL.'/images/flags/'.strtolower($l_codes[$l_name]).'.png)',
549
								'FLAG_LANG_ICONS' => 'url('.THEME_URL.'/images/flags/'.$langIcons.'.png)',
550 550
								));
551 551
		// Check if it is selected
552 552
		if($results_array['language'] == $l_codes[$l_name])
553 553

  

Also available in: Unified diff