[Phpbb-checkins] r9928 - in /branches/phpBB-3_0_0/phpBB: docs/CHANGELOG.html includes/acp/acp_database.php

[Andreas F. <ba...@ph...>]

Author: bantu
Date: Wed Aug  5 14:05:55 2009
New Revision: 9928

Log:
Fix Bug #48955 - Correctly extract column default value when exporting PostgreSQL tables.

Modified:
    branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
    branches/phpBB-3_0_0/phpBB/includes/acp/acp_database.php

Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Wed Aug  5 14:05:55 2009
***************
*** 188,193 ****
--- 188,194 ----
  		<li>[Fix] Adjust build_url() to not prepend $phpbb_root_path if path returned from redirect() is an URL. This fixes redirect issues with some installations and bridges. (Bug #47535)</li>
  		<li>[Fix] Do not mark global announcements as read if all topics in a forum become read (Bug #15729).</li>
  		<li>[Fix] Fix general error while registration, through undefined variable $config in validate_referer (Bug #49035 - Patch by wjvriend)</li>
+ 		<li>[Fix] Correctly extract column default value when exporting PostgreSQL tables. (Bug #48955)</li>
  		<li>[Change] submit_post() now accepts force_approved_state key passed to $data to indicate new posts being approved (true) or unapproved (false).</li>
  		<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
  		<li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li>

Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_database.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_database.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_database.php Wed Aug  5 14:05:55 2009
***************
*** 1157,1172 ****
  					AND (c.oid = d.adrelid)
  					AND d.adnum = " . $row['attnum'];
  			$def_res = $db->sql_query($sql_get_default);
  
! 			if (!$def_res)
  			{
  				unset($row['rowdefault']);
  			}
  			else
  			{
! 				$row['rowdefault'] = $db->sql_fetchfield('rowdefault', false, $def_res);
  			}
- 			$db->sql_freeresult($def_res);
  
  			if ($row['type'] == 'bpchar')
  			{
--- 1157,1173 ----
  					AND (c.oid = d.adrelid)
  					AND d.adnum = " . $row['attnum'];
  			$def_res = $db->sql_query($sql_get_default);
+ 			$def_row = $db->sql_fetchrow($def_res);
+ 			$db->sql_freeresult($def_res);
  
! 			if (empty($def_row))
  			{
  				unset($row['rowdefault']);
  			}
  			else
  			{
! 				$row['rowdefault'] = $def_row['rowdefault'];
  			}
  
  			if ($row['type'] == 'bpchar')
  			{