Project

General

Profile

« Previous | Next » 

Revision 1411

Added by FrankH over 13 years ago

  1. Bugfix for Tickets 965, 966 and 910

View differences:

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

  		




  13
  13
  
    
------------------------------------- 2.8.2 -------------------------------------


  		




  
  14
  
    
23 Jan-2011 Build 1411 Frank Heyne (FrankH)


  		




  
  15
  
    
# Bugfix for Tickets 965, 966 and 910


  		




  14
  16
  
    
23 Jan-2011 Build 1410 Frank Heyne (FrankH)


  		




  15
  17
  
    
# Bugfix for build 1409


  		




  16
  18
  
    
23 Jan-2011 Build 1409 Frank Heyne (FrankH)


  		












  

    
      branches/2.8.x/wb/admin/pages/settings.php
    
  





  118
  118
  
    
// Work-out if we should show the "manage sections" link


  		




  119
  119
  
    
$sql = 'SELECT `section_id` FROM `'.TABLE_PREFIX.'sections` WHERE `page_id`='.$page_id.' AND `module`="menu_link"';


  		




  120
  120
  
    
$query_sections = $database->query($sql);


  		




  121
  
  
    
if($query_sections->numRows() > 0)


  		




  
  121
  
    
if (isset($query_sections) && $query_sections->numRows() > 0)


  		




  122
  122
  
    
{


  		




  123
  123
  
    
    $template->set_var('DISPLAY_MANAGE_SECTIONS', 'display:none;');


  		




  124
  124
  
    
} elseif(MANAGE_SECTIONS == 'enabled')


  		




  ......




  472
  472
  
    

  		




  473
  473
  
    
$sql = 'SELECT * FROM `'.TABLE_PREFIX.'addons` WHERE `type` = "template" AND `function` = "template" order by `name`';


  		




  474
  474
  
    
$result = $database->query($sql);


  		




  475
  
  
    

  		




  476
  
  
    
if($result->numRows() > 0)


  		




  
  475
  
    
if (isset($result) && $result->numRows() > 0)


  		




  477
  476
  
    
{


  		




  478
  477
  
    
	while($addon = $result->fetchRow())


  		




  479
  478
  
    
    {


  		




  ......




  535
  534
  
    

  		




  536
  535
  
    
$sql = 'SELECT * FROM `'.TABLE_PREFIX.'addons` WHERE `type` = "language" ORDER BY `name`';


  		




  537
  536
  
    
$result = $database->query($sql);


  		




  538
  
  
    

  		




  539
  
  
    
if($result->numRows() > 0)


  		




  
  537
  
    
if (isset($result) && $result->numRows() > 0)


  		




  540
  538
  
    
{


  		




  541
  539
  
    
	while($addon = $result->fetchRow())


  		




  542
  540
  
    
    {


  		












  

    
      branches/2.8.x/wb/admin/pages/index.php
    
  





  231
  231
  
    

  		




  232
  232
  
    
					// $query_sections = $database->query("SELECT publ_start, publ_end FROM ".TABLE_PREFIX."sections WHERE page_id = '{$page['page_id']}' AND module != 'menu_link'");


  		




  233
  233
  
    

  		




  234
  
  
    
					if($query_sections->numRows() > 0)


  		




  
  234
  
    
					if (isset($query_sections) && $query_sections->numRows() > 0)


  		




  235
  235
  
    
                    {


  		




  236
  236
  
    
						$mdate_display=false;


  		




  237
  237
  
    
						while($mdate_res = $query_sections->fetchRow())


  		












  

    
      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.RC5');


  		




  55
  
  
    
if(!defined('REVISION')) define('REVISION', '1410');


  		




  
  55
  
    
if(!defined('REVISION')) define('REVISION', '1411');


  		




  56
  56
  
    

  		




  57
  57
  
    
?>


  		












  

    
      branches/2.8.x/wb/templates/wb_theme/templates/settings.htt
    
  





  195
  195
  
    
<!-- END show_php_error_level_block -->


  		




  196
  196
  
    
<!-- BEGIN show_wysiwyg_block -->


  		




  197
  197
  
    
<tr{DISPLAY_ADVANCED}>


  		




  198
  
  
    
	<td class="setting_name">{TEXT_WYSIWYG_STYLE}:</td>


  		




  199
  
  
    
	<td class="setting_value" colspan="2">


  		




  200
  
  
    
		<input type="text" name="wysiwyg_style" value="{WYSIWYG_STYLE}" />


  		




  201
  
  
    
	</td>


  		




  202
  
  
    
</tr>


  		




  203
  
  
    
<tr{DISPLAY_ADVANCED}>


  		




  204
  198
  
    
	<td class="setting_name">{TEXT_WYSIWYG_EDITOR}:</td>


  		




  205
  199
  
    
	<td class="setting_value" colspan="2">


  		




  206
  200
  
    
		<select name="wysiwyg_editor">


  		












  

    
      branches/2.8.x/wb/templates/argos_theme/templates/settings.htt
    
  





  180
  180
  
    
	</td>


  		




  181
  181
  
    
</tr>


  		




  182
  182
  
    
<tr{DISPLAY_ADVANCED}>


  		




  183
  
  
    
	<td class="setting_name">{TEXT_WYSIWYG_STYLE}:</td>


  		




  184
  
  
    
	<td class="setting_value" colspan="3"><input type="text" name="wysiwyg_style" value="{WYSIWYG_STYLE}" /></td>


  		




  185
  
  
    
</tr>


  		




  186
  
  
    
<tr{DISPLAY_ADVANCED}>


  		




  187
  183
  
    
	<td class="setting_name">{TEXT_WYSIWYG_EDITOR}:</td>


  		




  188
  184
  
    
	<td class="setting_value" colspan="3">


  		




  189
  185
  
    
		<select name="wysiwyg_editor">


  		












Also available in:  Unified diff