Menu
▾
▴
phpbb-checkins — If you subscribed to this list, please update: code.phpbb.com
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(193) |
Nov
(393) |
Dec
(347) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(401) |
Feb
(232) |
Mar
(343) |
Apr
(129) |
May
(129) |
Jun
(116) |
Jul
(189) |
Aug
(129) |
Sep
(68) |
Oct
(172) |
Nov
(298) |
Dec
(148) |
| 2003 |
Jan
(264) |
Feb
(210) |
Mar
(322) |
Apr
(309) |
May
(234) |
Jun
(188) |
Jul
(215) |
Aug
(161) |
Sep
(234) |
Oct
(163) |
Nov
(110) |
Dec
(7) |
| 2004 |
Jan
(95) |
Feb
(107) |
Mar
(55) |
Apr
(3) |
May
(49) |
Jun
(35) |
Jul
(57) |
Aug
(43) |
Sep
(56) |
Oct
(40) |
Nov
(25) |
Dec
(21) |
| 2005 |
Jan
(93) |
Feb
(25) |
Mar
(22) |
Apr
(72) |
May
(45) |
Jun
(24) |
Jul
(29) |
Aug
(20) |
Sep
(50) |
Oct
(93) |
Nov
(69) |
Dec
(183) |
| 2006 |
Jan
(185) |
Feb
(143) |
Mar
(402) |
Apr
(260) |
May
(322) |
Jun
(367) |
Jul
(234) |
Aug
(299) |
Sep
(206) |
Oct
(288) |
Nov
(338) |
Dec
(307) |
| 2007 |
Jan
(296) |
Feb
(250) |
Mar
(261) |
Apr
(434) |
May
(539) |
Jun
(274) |
Jul
(440) |
Aug
(190) |
Sep
(128) |
Oct
(249) |
Nov
(86) |
Dec
(51) |
| 2008 |
Jan
(177) |
Feb
(67) |
Mar
(61) |
Apr
(48) |
May
(56) |
Jun
(97) |
Jul
(60) |
Aug
(64) |
Sep
(151) |
Oct
(79) |
Nov
(109) |
Dec
(123) |
| 2009 |
Jan
(70) |
Feb
(70) |
Mar
(73) |
Apr
(80) |
May
(22) |
Jun
(193) |
Jul
(191) |
Aug
(181) |
Sep
(120) |
Oct
(48) |
Nov
(24) |
Dec
|
|
From: Meik S. <acy...@ph...> - 2009-11-16 10:34:42
|
Author: acydburn
Date: Mon Nov 16 10:33:51 2009
New Revision: 10272
Log:
merge r10271 (late-late fix. :) But good someone at least noticed)
Modified:
branches/phpBB-3_0_6/phpBB/ (props changed)
branches/phpBB-3_0_6/phpBB/install/install_update.php
Propchange: branches/phpBB-3_0_6/phpBB/
------------------------------------------------------------------------------
*** svn:mergeinfo (original)
--- svn:mergeinfo Mon Nov 16 10:33:51 2009
***************
*** 1 ****
! /branches/phpBB-3_0_0/phpBB:10260,10262,10267,10269
--- 1 ----
! /branches/phpBB-3_0_0/phpBB:10260,10262,10267,10269,10271
Modified: branches/phpBB-3_0_6/phpBB/install/install_update.php
==============================================================================
*** branches/phpBB-3_0_6/phpBB/install/install_update.php (original)
--- branches/phpBB-3_0_6/phpBB/install/install_update.php Mon Nov 16 10:33:51 2009
***************
*** 927,933 ****
{
if (function_exists('phpbb_is_writable') && !phpbb_is_writable($phpbb_root_path . 'store/'))
{
! trigger_error(sprintf($user->lang['DIRECTORY_NOT_WRITABLE'], $phpbb_root_path . 'store/'), E_USER_ERROR);
}
if ($use_method == '.zip')
--- 927,933 ----
{
if (function_exists('phpbb_is_writable') && !phpbb_is_writable($phpbb_root_path . 'store/'))
{
! trigger_error(sprintf('The directory â%sâ is not writable.', $phpbb_root_path . 'store/'), E_USER_ERROR);
}
if ($use_method == '.zip')
|
|
From: Andreas F. <ba...@ph...> - 2009-11-15 22:30:58
|
Author: bantu
Date: Sun Nov 15 22:30:07 2009
New Revision: 10271
Log:
Fix Bug #53965, Regression introduced in r9768 - Hardcode language for the time being.
Modified:
branches/phpBB-3_0_0/phpBB/install/install_update.php
Modified: branches/phpBB-3_0_0/phpBB/install/install_update.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/install_update.php (original)
--- branches/phpBB-3_0_0/phpBB/install/install_update.php Sun Nov 15 22:30:07 2009
***************
*** 927,933 ****
{
if (function_exists('phpbb_is_writable') && !phpbb_is_writable($phpbb_root_path . 'store/'))
{
! trigger_error(sprintf($user->lang['DIRECTORY_NOT_WRITABLE'], $phpbb_root_path . 'store/'), E_USER_ERROR);
}
if ($use_method == '.zip')
--- 927,933 ----
{
if (function_exists('phpbb_is_writable') && !phpbb_is_writable($phpbb_root_path . 'store/'))
{
! trigger_error(sprintf('The directory â%sâ is not writable.', $phpbb_root_path . 'store/'), E_USER_ERROR);
}
if ($use_method == '.zip')
|
|
From: Meik S. <acy...@ph...> - 2009-11-14 23:00:49
|
Author: acydburn
Date: Sat Nov 14 23:00:30 2009
New Revision: 10270
Log:
merge r10269
Modified:
branches/phpBB-3_0_6/phpBB/ (props changed)
branches/phpBB-3_0_6/phpBB/install/database_update.php
Propchange: branches/phpBB-3_0_6/phpBB/
------------------------------------------------------------------------------
*** svn:mergeinfo (original)
--- svn:mergeinfo Sat Nov 14 23:00:30 2009
***************
*** 1 ****
! /branches/phpBB-3_0_0/phpBB:10260,10262,10267
--- 1 ----
! /branches/phpBB-3_0_0/phpBB:10260,10262,10267,10269
Modified: branches/phpBB-3_0_6/phpBB/install/database_update.php
==============================================================================
*** branches/phpBB-3_0_6/phpBB/install/database_update.php (original)
--- branches/phpBB-3_0_6/phpBB/install/database_update.php Sat Nov 14 23:00:30 2009
***************
*** 1563,1569 ****
break;
// No changes from 3.0.6-RC4 to 3.0.6
! case '3.0.6-RC3':
break;
}
}
--- 1563,1569 ----
break;
// No changes from 3.0.6-RC4 to 3.0.6
! case '3.0.6-RC4':
break;
}
}
|
|
From: Andreas F. <ba...@ph...> - 2009-11-14 21:28:11
|
Author: bantu
Date: Sat Nov 14 21:27:24 2009
New Revision: 10269
Log:
Fix Bug #53945 - Typo in r10267.
Modified:
branches/phpBB-3_0_0/phpBB/install/database_update.php
Modified: branches/phpBB-3_0_0/phpBB/install/database_update.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/database_update.php (original)
--- branches/phpBB-3_0_0/phpBB/install/database_update.php Sat Nov 14 21:27:24 2009
***************
*** 1563,1569 ****
break;
// No changes from 3.0.6-RC4 to 3.0.6
! case '3.0.6-RC3':
break;
}
}
--- 1563,1569 ----
break;
// No changes from 3.0.6-RC4 to 3.0.6
! case '3.0.6-RC4':
break;
}
}
|
|
From: Meik S. <acy...@ph...> - 2009-11-14 20:16:37
|
Author: acydburn
Date: Sat Nov 14 20:15:50 2009
New Revision: 10268
Log:
merge r10267
Modified:
branches/phpBB-3_0_6/phpBB/ (props changed)
branches/phpBB-3_0_6/phpBB/includes/constants.php
branches/phpBB-3_0_6/phpBB/install/database_update.php
branches/phpBB-3_0_6/phpBB/install/schemas/schema_data.sql
Propchange: branches/phpBB-3_0_6/phpBB/
------------------------------------------------------------------------------
*** svn:mergeinfo (original)
--- svn:mergeinfo Sat Nov 14 20:15:50 2009
***************
*** 1 ****
! /branches/phpBB-3_0_0/phpBB:10260,10262
--- 1 ----
! /branches/phpBB-3_0_0/phpBB:10260,10262,10267
Modified: branches/phpBB-3_0_6/phpBB/includes/constants.php
==============================================================================
*** branches/phpBB-3_0_6/phpBB/includes/constants.php (original)
--- branches/phpBB-3_0_6/phpBB/includes/constants.php Sat Nov 14 20:15:50 2009
***************
*** 25,31 ****
*/
// phpBB Version
! define('PHPBB_VERSION', '3.0.6-RC4');
// QA-related
// define('PHPBB_QA', 1);
--- 25,31 ----
*/
// phpBB Version
! define('PHPBB_VERSION', '3.0.6');
// QA-related
// define('PHPBB_QA', 1);
Modified: branches/phpBB-3_0_6/phpBB/install/database_update.php
==============================================================================
*** branches/phpBB-3_0_6/phpBB/install/database_update.php (original)
--- branches/phpBB-3_0_6/phpBB/install/database_update.php Sat Nov 14 20:15:50 2009
***************
*** 8,14 ****
*
*/
! $updates_to_version = '3.0.6-RC4';
// Enter any version to update from to test updates. The version within the db will not be updated.
$debug_from_version = false;
--- 8,14 ----
*
*/
! $updates_to_version = '3.0.6';
// Enter any version to update from to test updates. The version within the db will not be updated.
$debug_from_version = false;
***************
*** 891,896 ****
--- 891,898 ----
'3.0.6-RC2' => array(),
// No changes from 3.0.6-RC3 to 3.0.6-RC4
'3.0.6-RC3' => array(),
+ // No changes from 3.0.6-RC4 to 3.0.6
+ '3.0.6-RC4' => array(),
);
}
***************
*** 1559,1564 ****
--- 1561,1570 ----
// No changes from 3.0.6-RC3 to 3.0.6-RC4
case '3.0.6-RC3':
break;
+
+ // No changes from 3.0.6-RC4 to 3.0.6
+ case '3.0.6-RC3':
+ break;
}
}
Modified: branches/phpBB-3_0_6/phpBB/install/schemas/schema_data.sql
==============================================================================
*** branches/phpBB-3_0_6/phpBB/install/schemas/schema_data.sql (original)
--- branches/phpBB-3_0_6/phpBB/install/schemas/schema_data.sql Sat Nov 14 20:15:50 2009
***************
*** 239,245 ****
INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.6-RC4');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400');
--- 239,245 ----
INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.6');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400');
|
|
From: Meik S. <acy...@ph...> - 2009-11-14 20:12:23
|
Author: acydburn
Date: Sat Nov 14 20:11:38 2009
New Revision: 10267
Log:
Tag as 3.0.6
Modified:
branches/phpBB-3_0_0/phpBB/includes/constants.php
branches/phpBB-3_0_0/phpBB/install/database_update.php
branches/phpBB-3_0_0/phpBB/install/schemas/schema_data.sql
Modified: branches/phpBB-3_0_0/phpBB/includes/constants.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/constants.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/constants.php Sat Nov 14 20:11:38 2009
***************
*** 25,31 ****
*/
// phpBB Version
! define('PHPBB_VERSION', '3.0.6-RC4');
// QA-related
// define('PHPBB_QA', 1);
--- 25,31 ----
*/
// phpBB Version
! define('PHPBB_VERSION', '3.0.6');
// QA-related
// define('PHPBB_QA', 1);
Modified: branches/phpBB-3_0_0/phpBB/install/database_update.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/database_update.php (original)
--- branches/phpBB-3_0_0/phpBB/install/database_update.php Sat Nov 14 20:11:38 2009
***************
*** 8,14 ****
*
*/
! $updates_to_version = '3.0.6-RC4';
// Enter any version to update from to test updates. The version within the db will not be updated.
$debug_from_version = false;
--- 8,14 ----
*
*/
! $updates_to_version = '3.0.6';
// Enter any version to update from to test updates. The version within the db will not be updated.
$debug_from_version = false;
***************
*** 891,896 ****
--- 891,898 ----
'3.0.6-RC2' => array(),
// No changes from 3.0.6-RC3 to 3.0.6-RC4
'3.0.6-RC3' => array(),
+ // No changes from 3.0.6-RC4 to 3.0.6
+ '3.0.6-RC4' => array(),
);
}
***************
*** 1559,1564 ****
--- 1561,1570 ----
// No changes from 3.0.6-RC3 to 3.0.6-RC4
case '3.0.6-RC3':
break;
+
+ // No changes from 3.0.6-RC4 to 3.0.6
+ case '3.0.6-RC3':
+ break;
}
}
Modified: branches/phpBB-3_0_0/phpBB/install/schemas/schema_data.sql
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/schemas/schema_data.sql (original)
--- branches/phpBB-3_0_0/phpBB/install/schemas/schema_data.sql Sat Nov 14 20:11:38 2009
***************
*** 239,245 ****
INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.6-RC4');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400');
--- 239,245 ----
INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.6');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400');
|
|
From: Joas S. <nic...@ph...> - 2009-11-14 19:12:59
|
Author: nickvergessen
Date: Sat Nov 14 19:12:12 2009
New Revision: 10266
Log:
[Fix] Force full date for board online record date.
Authorised by: bantu
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/includes/functions.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 Sat Nov 14 19:12:12 2009
***************
*** 90,95 ****
--- 90,96 ----
<ul>
<li>[Fix] Allow ban reason and length to be selected and copied in ACP and subsilver2 MCP. (Bug #51095)</li>
+ <li>[Fix] Force full date for board online record date.</li>
</ul>
<a name="v305"></a><h3>1.ii. Changes since 3.0.5</h3>
Modified: branches/phpBB-3_0_0/phpBB/includes/functions.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions.php Sat Nov 14 19:12:12 2009
***************
*** 3959,3965 ****
$s_last_visit = ($user->data['user_id'] != ANONYMOUS) ? $user->format_date($user->data['session_last_visit']) : '';
// Get users online list ... if required
! $l_online_users = $online_userlist = $l_online_record = '';
if ($config['load_online'] && $config['load_online_time'] && $display_online_list)
{
--- 3959,3965 ----
$s_last_visit = ($user->data['user_id'] != ANONYMOUS) ? $user->format_date($user->data['session_last_visit']) : '';
// Get users online list ... if required
! $l_online_users = $online_userlist = $l_online_record = $l_online_time = '';
if ($config['load_online'] && $config['load_online_time'] && $display_online_list)
{
***************
*** 3982,3996 ****
set_config('record_online_date', time(), true);
}
! $l_online_record = sprintf($user->lang['RECORD_ONLINE_USERS'], $config['record_online_users'], $user->format_date($config['record_online_date']));
$l_online_time = ($config['load_online_time'] == 1) ? 'VIEW_ONLINE_TIME' : 'VIEW_ONLINE_TIMES';
$l_online_time = sprintf($user->lang[$l_online_time], $config['load_online_time']);
}
- else
- {
- $l_online_time = '';
- }
$l_privmsgs_text = $l_privmsgs_text_unread = '';
$s_privmsg_new = false;
--- 3982,3992 ----
set_config('record_online_date', time(), true);
}
! $l_online_record = sprintf($user->lang['RECORD_ONLINE_USERS'], $config['record_online_users'], $user->format_date($config['record_online_date'], false, true));
$l_online_time = ($config['load_online_time'] == 1) ? 'VIEW_ONLINE_TIME' : 'VIEW_ONLINE_TIMES';
$l_online_time = sprintf($user->lang[$l_online_time], $config['load_online_time']);
}
$l_privmsgs_text = $l_privmsgs_text_unread = '';
$s_privmsg_new = false;
|
|
From: Andreas F. <ba...@ph...> - 2009-11-10 10:23:56
|
Author: bantu
Date: Tue Nov 10 10:23:07 2009
New Revision: 10265
Log:
Fix Bug #51095 - Allow ban reason and length to be selected and copied in ACP and subsilver2 MCP.
Modified:
branches/phpBB-3_0_0/phpBB/adm/style/acp_ban.html
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/mcp_ban.html
Modified: branches/phpBB-3_0_0/phpBB/adm/style/acp_ban.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/style/acp_ban.html (original)
--- branches/phpBB-3_0_0/phpBB/adm/style/acp_ban.html Tue Nov 10 10:23:07 2009
***************
*** 93,107 ****
</dl>
<dl>
<dt><label for="unbanlength">{L_BAN_LENGTH}:</label></dt>
! <dd><input style="border: 0;" type="text" class="text full" disabled="disabled" name="unbanlength" id="unbanlength" /></dd>
</dl>
<dl>
<dt><label for="unbanreason">{L_BAN_REASON}:</label></dt>
! <dd><textarea style="border: 0;" class="text full" disabled="disabled" name="unbanreason" id="unbanreason" rows="5" cols="80"> </textarea></dd>
</dl>
<dl>
<dt><label for="unbangivereason">{L_BAN_GIVE_REASON}:</label></dt>
! <dd><textarea style="border: 0;" class="text full" disabled="disabled" name="unbangivereason" id="unbangivereason" rows="5" cols="80"> </textarea></dd>
</dl>
<p class="submit-buttons">
--- 93,107 ----
</dl>
<dl>
<dt><label for="unbanlength">{L_BAN_LENGTH}:</label></dt>
! <dd><input style="border: 0;" type="text" class="text full" readonly="readonly" name="unbanlength" id="unbanlength" /></dd>
</dl>
<dl>
<dt><label for="unbanreason">{L_BAN_REASON}:</label></dt>
! <dd><textarea style="border: 0;" class="text full" readonly="readonly" name="unbanreason" id="unbanreason" rows="5" cols="80"> </textarea></dd>
</dl>
<dl>
<dt><label for="unbangivereason">{L_BAN_GIVE_REASON}:</label></dt>
! <dd><textarea style="border: 0;" class="text full" readonly="readonly" name="unbangivereason" id="unbangivereason" rows="5" cols="80"> </textarea></dd>
</dl>
<p class="submit-buttons">
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 Tue Nov 10 10:23:07 2009
***************
*** 89,95 ****
<a name="v306"></a><h3>1.i. Changes since 3.0.6</h3>
<ul>
!
</ul>
<a name="v305"></a><h3>1.ii. Changes since 3.0.5</h3>
--- 89,95 ----
<a name="v306"></a><h3>1.i. Changes since 3.0.6</h3>
<ul>
! <li>[Fix] Allow ban reason and length to be selected and copied in ACP and subsilver2 MCP. (Bug #51095)</li>
</ul>
<a name="v305"></a><h3>1.ii. Changes since 3.0.5</h3>
Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/mcp_ban.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/mcp_ban.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/mcp_ban.html Tue Nov 10 10:23:07 2009
***************
*** 84,98 ****
</tr>
<tr>
<td class="row1" valign="top"><b>{L_BAN_LENGTH}:</b></td>
! <td class="row2"><input style="border: 0; width: 100%" type="text" name="unbanlength" disabled="disabled" /></td>
</tr>
<tr>
<td class="row1" valign="top"><b>{L_BAN_REASON}:</b></td>
! <td class="row2"><textarea style="border: 0; width: 100%" name="unbanreason" disabled="disabled" rows="5" cols="80"> </textarea></td>
</tr>
<tr>
<td class="row1" valign="top"><b>{L_BAN_GIVE_REASON}:</b></td>
! <td class="row2"><textarea style="border: 0; width: 100%" name="unbangivereason" disabled="disabled" rows="5" cols="80"> </textarea></td>
</tr>
<tr>
<td class="cat" colspan="2" align="center"><input type="submit" name="unbansubmit" value="{L_SUBMIT}" class="btnmain" /> <input type="reset" value="{L_RESET}" class="btnlite" /> </td>
--- 84,98 ----
</tr>
<tr>
<td class="row1" valign="top"><b>{L_BAN_LENGTH}:</b></td>
! <td class="row2"><input style="border: 0; width: 100%" type="text" name="unbanlength" readonly="readonly" /></td>
</tr>
<tr>
<td class="row1" valign="top"><b>{L_BAN_REASON}:</b></td>
! <td class="row2"><textarea style="border: 0; width: 100%" name="unbanreason" readonly="readonly" rows="5" cols="80"> </textarea></td>
</tr>
<tr>
<td class="row1" valign="top"><b>{L_BAN_GIVE_REASON}:</b></td>
! <td class="row2"><textarea style="border: 0; width: 100%" name="unbangivereason" readonly="readonly" rows="5" cols="80"> </textarea></td>
</tr>
<tr>
<td class="cat" colspan="2" align="center"><input type="submit" name="unbansubmit" value="{L_SUBMIT}" class="btnmain" /> <input type="reset" value="{L_RESET}" class="btnlite" /> </td>
|
|
From: Andreas F. <ba...@ph...> - 2009-11-10 10:15:06
|
Author: bantu
Date: Tue Nov 10 10:14:19 2009
New Revision: 10264
Log:
Add 3.0.6 to changelog.
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
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 Tue Nov 10 10:14:19 2009
***************
*** 53,58 ****
--- 53,59 ----
<ol>
<li><a href="#changelog">Changelog</a>
<ol style="list-style-type: lower-roman;">
+ <li><a href="#v306">Changes since 3.0.6</a></li>
<li><a href="#v305">Changes since 3.0.5</a></li>
<li><a href="#v304">Changes since 3.0.4</a></li>
<li><a href="#v303">Changes since 3.0.3</a></li>
***************
*** 85,91 ****
<div class="inner"><span class="corners-top"><span></span></span>
<div class="content">
! <a name="v305"></a><h3>1.i. Changes since 3.0.5</h3>
<ul>
<li>[Fix] Allow whitespaces in avatar gallery names. (Bug #44955)</li>
--- 86,98 ----
<div class="inner"><span class="corners-top"><span></span></span>
<div class="content">
! <a name="v306"></a><h3>1.i. Changes since 3.0.6</h3>
!
! <ul>
!
! </ul>
!
! <a name="v305"></a><h3>1.ii. Changes since 3.0.5</h3>
<ul>
<li>[Fix] Allow whitespaces in avatar gallery names. (Bug #44955)</li>
***************
*** 307,313 ****
<li>[Feature] Send anonymous statistical information to phpBB on installation and update (optional).</li>
</ul>
! <a name="v304"></a><h3>1.ii. Changes since 3.0.4</h3>
<ul>
<li>[Fix] Delete user entry from ban list table upon user deletion (Bug #40015 - Patch by TerraFrost)</li>
--- 314,320 ----
<li>[Feature] Send anonymous statistical information to phpBB on installation and update (optional).</li>
</ul>
! <a name="v304"></a><h3>1.iii. Changes since 3.0.4</h3>
<ul>
<li>[Fix] Delete user entry from ban list table upon user deletion (Bug #40015 - Patch by TerraFrost)</li>
***************
*** 396,402 ****
<li>[Sec] Only use forum id supplied for posting if global announcement detected. (Reported by nickvergessen)</li>
</ul>
! <a name="v303"></a><h3>1.iii. Changes since 3.0.3</h3>
<ul>
<li>[Fix] Allow mixed-case template directories to be inherited (Bug #36725)</li>
--- 403,409 ----
<li>[Sec] Only use forum id supplied for posting if global announcement detected. (Reported by nickvergessen)</li>
</ul>
! <a name="v303"></a><h3>1.iv. Changes since 3.0.3</h3>
<ul>
<li>[Fix] Allow mixed-case template directories to be inherited (Bug #36725)</li>
***************
*** 428,434 ****
<li>[Sec] Ask for forum password if post within passworded forum quoted in private message. (Reported by nickvergessen)</li>
</ul>
! <a name="v302"></a><h3>1.iv. Changes since 3.0.2</h3>
<ul>
<li>[Fix] Correctly set topic starter if first post in topic removed (Bug #30575 - Patch by blueray2048)</li>
--- 435,441 ----
<li>[Sec] Ask for forum password if post within passworded forum quoted in private message. (Reported by nickvergessen)</li>
</ul>
! <a name="v302"></a><h3>1.v. Changes since 3.0.2</h3>
<ul>
<li>[Fix] Correctly set topic starter if first post in topic removed (Bug #30575 - Patch by blueray2048)</li>
***************
*** 527,533 ****
<li>[Sec Precaution] Stricter validation of the HTTP_HOST header (Thanks to Techie-Micheal et al for pointing out possible issues in derived code)</li>
</ul>
! <a name="v301"></a><h3>1.v. Changes since 3.0.1</h3>
<ul>
<li>[Fix] Ability to set permissions on non-mysql dbms (Bug #24955)</li>
--- 534,540 ----
<li>[Sec Precaution] Stricter validation of the HTTP_HOST header (Thanks to Techie-Micheal et al for pointing out possible issues in derived code)</li>
</ul>
! <a name="v301"></a><h3>1.vi. Changes since 3.0.1</h3>
<ul>
<li>[Fix] Ability to set permissions on non-mysql dbms (Bug #24955)</li>
***************
*** 575,581 ****
<li>[Sec] Only allow urls gone through redirect() being used within login_box(). (thanks nookieman)</li>
</ul>
! <a name="v300"></a><h3>1.vi Changes since 3.0.0</h3>
<ul>
<li>[Change] Validate birthdays (Bug #15004)</li>
--- 582,588 ----
<li>[Sec] Only allow urls gone through redirect() being used within login_box(). (thanks nookieman)</li>
</ul>
! <a name="v300"></a><h3>1.vii Changes since 3.0.0</h3>
<ul>
<li>[Change] Validate birthdays (Bug #15004)</li>
***************
*** 646,652 ****
<li>[Fix] Find and display colliding usernames correctly when converting from one database to another (Bug #23925)</li>
</ul>
! <a name="v30rc8"></a><h3>1.vii. Changes since 3.0.RC8</h3>
<ul>
<li>[Fix] Cleaned usernames contain only single spaces, so "a_name" and "a__name" are treated as the same name (Bug #15634)</li>
--- 653,659 ----
<li>[Fix] Find and display colliding usernames correctly when converting from one database to another (Bug #23925)</li>
</ul>
! <a name="v30rc8"></a><h3>1.viii. Changes since 3.0.RC8</h3>
<ul>
<li>[Fix] Cleaned usernames contain only single spaces, so "a_name" and "a__name" are treated as the same name (Bug #15634)</li>
***************
*** 655,661 ****
<li>[Fix] Call garbage_collection() within database updater to correctly close connections (affects Oracle for example)</li>
</ul>
! <a name="v30rc7"></a><h3>1.viii. Changes since 3.0.RC7</h3>
<ul>
<li>[Fix] Fixed MSSQL related bug in the update system</li>
--- 662,668 ----
<li>[Fix] Call garbage_collection() within database updater to correctly close connections (affects Oracle for example)</li>
</ul>
! <a name="v30rc7"></a><h3>1.ix. Changes since 3.0.RC7</h3>
<ul>
<li>[Fix] Fixed MSSQL related bug in the update system</li>
***************
*** 690,696 ****
<li>[Fix] No duplication of active topics (Bug #15474)</li>
</ul>
! <a name="v30rc6"></a><h3>1.ix. Changes since 3.0.RC6</h3>
<ul>
<li>[Fix] Submitting language changes using acp_language (Bug #14736)</li>
--- 697,703 ----
<li>[Fix] No duplication of active topics (Bug #15474)</li>
</ul>
! <a name="v30rc6"></a><h3>1.x. Changes since 3.0.RC6</h3>
<ul>
<li>[Fix] Submitting language changes using acp_language (Bug #14736)</li>
***************
*** 700,706 ****
<li>[Fix] Able to request new password (Bug #14743)</li>
</ul>
! <a name="v30rc5"></a><h3>1.x. Changes since 3.0.RC5</h3>
<ul>
<li>[Feature] Removing constant PHPBB_EMBEDDED in favor of using an exit_handler(); the constant was meant to achive this more or less.</li>
--- 707,713 ----
<li>[Fix] Able to request new password (Bug #14743)</li>
</ul>
! <a name="v30rc5"></a><h3>1.xi. Changes since 3.0.RC5</h3>
<ul>
<li>[Feature] Removing constant PHPBB_EMBEDDED in favor of using an exit_handler(); the constant was meant to achive this more or less.</li>
***************
*** 763,769 ****
<li>[Sec] New password hashing mechanism for storing passwords (#i42)</li>
</ul>
! <a name="v30rc4"></a><h3>1.xi. Changes since 3.0.RC4</h3>
<ul>
<li>[Fix] MySQL, PostgreSQL and SQLite related database fixes (Bug #13862)</li>
--- 770,776 ----
<li>[Sec] New password hashing mechanism for storing passwords (#i42)</li>
</ul>
! <a name="v30rc4"></a><h3>1.xii. Changes since 3.0.RC4</h3>
<ul>
<li>[Fix] MySQL, PostgreSQL and SQLite related database fixes (Bug #13862)</li>
***************
*** 814,820 ****
<li>[Fix] odbc_autocommit causing existing result sets to be dropped (Bug #14182)</li>
</ul>
! <a name="v30rc3"></a><h3>1.xii. Changes since 3.0.RC3</h3>
<ul>
<li>[Fix] Fixing some subsilver2 and prosilver style issues</li>
--- 821,827 ----
<li>[Fix] odbc_autocommit causing existing result sets to be dropped (Bug #14182)</li>
</ul>
! <a name="v30rc3"></a><h3>1.xiii. Changes since 3.0.RC3</h3>
<ul>
<li>[Fix] Fixing some subsilver2 and prosilver style issues</li>
***************
*** 923,929 ****
</ul>
! <a name="v30rc2"></a><h3>1.xiii. Changes since 3.0.RC2</h3>
<ul>
<li>[Fix] Re-allow searching within the memberlist</li>
--- 930,936 ----
</ul>
! <a name="v30rc2"></a><h3>1.xiv. Changes since 3.0.RC2</h3>
<ul>
<li>[Fix] Re-allow searching within the memberlist</li>
***************
*** 969,975 ****
</ul>
! <a name="v30rc1"></a><h3>1.xiv. Changes since 3.0.RC1</h3>
<ul>
<li>[Fix] (X)HTML issues within the templates (Bug #11255, #11255)</li>
--- 976,982 ----
</ul>
! <a name="v30rc1"></a><h3>1.xv. Changes since 3.0.RC1</h3>
<ul>
<li>[Fix] (X)HTML issues within the templates (Bug #11255, #11255)</li>
|
|
From: Meik S. <acy...@ph...> - 2009-11-09 16:49:30
|
Author: acydburn
Date: Mon Nov 9 16:49:15 2009
New Revision: 10263
Log:
merge r10262
Fix for r10255
Modified:
branches/phpBB-3_0_6/phpBB/ (props changed)
branches/phpBB-3_0_6/phpBB/styles/prosilver/template/forum_fn.js
Propchange: branches/phpBB-3_0_6/phpBB/
------------------------------------------------------------------------------
*** svn:mergeinfo (original)
--- svn:mergeinfo Mon Nov 9 16:49:15 2009
***************
*** 1 ****
! /branches/phpBB-3_0_0/phpBB:10260
--- 1 ----
! /branches/phpBB-3_0_0/phpBB:10260,10262
Modified: branches/phpBB-3_0_6/phpBB/styles/prosilver/template/forum_fn.js
==============================================================================
*** branches/phpBB-3_0_6/phpBB/styles/prosilver/template/forum_fn.js (original)
--- branches/phpBB-3_0_6/phpBB/styles/prosilver/template/forum_fn.js Mon Nov 9 16:49:15 2009
***************
*** 359,365 ****
if (!event.which && ((event.charCode || event.charCode === 0) ? event.charCode : event.keyCode))
event.which = event.charCode || event.keyCode;
! if (phpbb_set_autocomplete(event))
return true;
var current = selector['parentNode'];
--- 359,365 ----
if (!event.which && ((event.charCode || event.charCode === 0) ? event.charCode : event.keyCode))
event.which = event.charCode || event.keyCode;
! if (phpbb_check_key(event))
return true;
var current = selector['parentNode'];
|
|
From: Meik S. <acy...@ph...> - 2009-11-09 16:48:59
|
Author: acydburn
Date: Mon Nov 9 16:48:13 2009
New Revision: 10262
Log:
Fix for r10255
Modified:
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/forum_fn.js
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/forum_fn.js
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/forum_fn.js (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/forum_fn.js Mon Nov 9 16:48:13 2009
***************
*** 359,365 ****
if (!event.which && ((event.charCode || event.charCode === 0) ? event.charCode : event.keyCode))
event.which = event.charCode || event.keyCode;
! if (phpbb_set_autocomplete(event))
return true;
var current = selector['parentNode'];
--- 359,365 ----
if (!event.which && ((event.charCode || event.charCode === 0) ? event.charCode : event.keyCode))
event.which = event.charCode || event.keyCode;
! if (phpbb_check_key(event))
return true;
var current = selector['parentNode'];
|
|
From: Meik S. <acy...@ph...> - 2009-11-09 16:29:44
|
Author: acydburn
Date: Mon Nov 9 16:29:30 2009
New Revision: 10261
Log:
merging r10260
Fix sql error in cache_moderators() if using postgresql. (Bug #53765)
Modified:
branches/phpBB-3_0_6/phpBB/ (props changed)
branches/phpBB-3_0_6/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_6/phpBB/includes/functions_admin.php
Propchange: branches/phpBB-3_0_6/phpBB/
------------------------------------------------------------------------------
svn:mergeinfo = /branches/phpBB-3_0_0/phpBB:10260
Modified: branches/phpBB-3_0_6/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_6/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_6/phpBB/docs/CHANGELOG.html Mon Nov 9 16:29:30 2009
***************
*** 213,218 ****
--- 213,219 ----
<li>[Fix] Fixed database updater for changes to columns having default value in MSSQL (adding/dropping constraints).</li>
<li>[Fix] Jabber SASL PLAIN authentication failures. (Bug #52995)</li>
<li>[Fix] Check sort options on memberlist to avoid a general error. (Bug #53655)</li>
+ <li>[Fix] Fix sql error in cache_moderators() if using postgresql. (Bug #53765)</li>
<li>[Change] Database updater now supports checking for existing/missing indexes.</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>
Modified: branches/phpBB-3_0_6/phpBB/includes/functions_admin.php
==============================================================================
*** branches/phpBB-3_0_6/phpBB/includes/functions_admin.php (original)
--- branches/phpBB-3_0_6/phpBB/includes/functions_admin.php Mon Nov 9 16:29:30 2009
***************
*** 2361,2368 ****
'FROM' => array(
ACL_OPTIONS_TABLE => 'o',
USER_GROUP_TABLE => 'ug',
- ACL_GROUPS_TABLE => 'a',
GROUPS_TABLE => 'g',
),
'LEFT_JOIN' => array(
--- 2361,2368 ----
'FROM' => array(
ACL_OPTIONS_TABLE => 'o',
USER_GROUP_TABLE => 'ug',
GROUPS_TABLE => 'g',
+ ACL_GROUPS_TABLE => 'a',
),
'LEFT_JOIN' => array(
|
|
From: Meik S. <acy...@ph...> - 2009-11-09 16:24:03
|
Author: acydburn
Date: Mon Nov 9 16:23:15 2009
New Revision: 10260
Log:
Fix sql error in cache_moderators() if using postgresql. (Bug #53765)
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/includes/functions_admin.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 Mon Nov 9 16:23:15 2009
***************
*** 213,218 ****
--- 213,219 ----
<li>[Fix] Fixed database updater for changes to columns having default value in MSSQL (adding/dropping constraints).</li>
<li>[Fix] Jabber SASL PLAIN authentication failures. (Bug #52995)</li>
<li>[Fix] Check sort options on memberlist to avoid a general error. (Bug #53655)</li>
+ <li>[Fix] Fix sql error in cache_moderators() if using postgresql. (Bug #53765)</li>
<li>[Change] Database updater now supports checking for existing/missing indexes.</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>
Modified: branches/phpBB-3_0_0/phpBB/includes/functions_admin.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_admin.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_admin.php Mon Nov 9 16:23:15 2009
***************
*** 2361,2368 ****
'FROM' => array(
ACL_OPTIONS_TABLE => 'o',
USER_GROUP_TABLE => 'ug',
- ACL_GROUPS_TABLE => 'a',
GROUPS_TABLE => 'g',
),
'LEFT_JOIN' => array(
--- 2361,2368 ----
'FROM' => array(
ACL_OPTIONS_TABLE => 'o',
USER_GROUP_TABLE => 'ug',
GROUPS_TABLE => 'g',
+ ACL_GROUPS_TABLE => 'a',
),
'LEFT_JOIN' => array(
|
|
From: Meik S. <acy...@ph...> - 2009-11-09 14:24:52
|
Author: acydburn
Date: Mon Nov 9 14:24:06 2009
New Revision: 10259
Log:
Branch off 3.0.6. This ensures we are able to work on the next release and also decide what will be included as late fixes in RC's.
Added:
branches/phpBB-3_0_6/
- copied from r10258, branches/phpBB-3_0_0/
|
|
From: Meik S. <acy...@ph...> - 2009-11-08 11:17:55
|
Author: acydburn
Date: Sun Nov 8 11:17:32 2009
New Revision: 10258
Log:
Fix Bug #53435 - unneccessary error on forum creation screen, actually, this code is no longer even executed since RC4
Modified:
branches/phpBB-3_0_0/phpBB/includes/acp/acp_forums.php
Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_forums.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_forums.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_forums.php Sun Nov 8 11:17:32 2009
***************
*** 75,87 ****
trigger_error($user->lang['NO_PERMISSION_FORUM_ADD'] . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id), E_USER_WARNING);
}
- case 'copy_perm':
-
- if (!(($auth->acl_get('a_fauth') && $auth->acl_get('a_authusers') && $auth->acl_get('a_authgroups') && $auth->acl_get('a_mauth'))))
- {
- trigger_error($user->lang['NO_PERMISSION_COPY'] . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id), E_USER_WARNING);
- }
-
break;
}
--- 75,80 ----
|
|
From: Meik S. <acy...@ph...> - 2009-11-07 15:12:23
|
Author: acydburn
Date: Sat Nov 7 15:11:40 2009
New Revision: 10257
Log:
fix whitespaces/tabs in r10256
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/memberlist.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 Sat Nov 7 15:11:40 2009
***************
*** 213,219 ****
<li>[Fix] Fixed database updater for changes to columns having default value in MSSQL (adding/dropping constraints).</li>
<li>[Fix] Jabber SASL PLAIN authentication failures. (Bug #52995)</li>
<li>[Fix] Check sort options on memberlist to avoid a general error. (Bug #53655)</li>
! <li>[Change] Database updater now supports checking for existing/missing indexes.</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] Template engine now permits variable includes to a limited extent.</li>
--- 213,219 ----
<li>[Fix] Fixed database updater for changes to columns having default value in MSSQL (adding/dropping constraints).</li>
<li>[Fix] Jabber SASL PLAIN authentication failures. (Bug #52995)</li>
<li>[Fix] Check sort options on memberlist to avoid a general error. (Bug #53655)</li>
! <li>[Change] Database updater now supports checking for existing/missing indexes.</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] Template engine now permits variable includes to a limited extent.</li>
Modified: branches/phpBB-3_0_0/phpBB/memberlist.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/memberlist.php (original)
--- branches/phpBB-3_0_0/phpBB/memberlist.php Sat Nov 7 15:11:40 2009
***************
*** 975,986 ****
$msn = request_var('msn', '');
$jabber = request_var('jabber', '');
$search_group_id = request_var('search_group_id', 0);
!
! // when using these, make sure that actually have values defined in $find_key_match
$joined_select = request_var('joined_select', 'lt');
$active_select = request_var('active_select', 'lt');
$count_select = request_var('count_select', 'eq');
!
$joined = explode('-', request_var('joined', ''));
$active = explode('-', request_var('active', ''));
$count = (request_var('count', '') !== '') ? request_var('count', 0) : '';
--- 975,986 ----
$msn = request_var('msn', '');
$jabber = request_var('jabber', '');
$search_group_id = request_var('search_group_id', 0);
!
! // when using these, make sure that we actually have values defined in $find_key_match
$joined_select = request_var('joined_select', 'lt');
$active_select = request_var('active_select', 'lt');
$count_select = request_var('count_select', 'eq');
!
$joined = explode('-', request_var('joined', ''));
$active = explode('-', request_var('active', ''));
$count = (request_var('count', '') !== '') ? request_var('count', 0) : '';
|
|
From: Henry S. <kel...@ph...> - 2009-11-07 13:53:45
|
Author: Kellanved
Date: Sat Nov 7 13:33:19 2009
New Revision: 10256
Log:
#53655
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/memberlist.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 Sat Nov 7 13:33:19 2009
***************
*** 212,218 ****
<li>[Fix] Only check whether forum image exists if forum image is specified. (Bug #51905)</li>
<li>[Fix] Fixed database updater for changes to columns having default value in MSSQL (adding/dropping constraints).</li>
<li>[Fix] Jabber SASL PLAIN authentication failures. (Bug #52995)</li>
! <li>[Change] Database updater now supports checking for existing/missing indexes.</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] Template engine now permits variable includes to a limited extent.</li>
--- 212,219 ----
<li>[Fix] Only check whether forum image exists if forum image is specified. (Bug #51905)</li>
<li>[Fix] Fixed database updater for changes to columns having default value in MSSQL (adding/dropping constraints).</li>
<li>[Fix] Jabber SASL PLAIN authentication failures. (Bug #52995)</li>
! <li>[Fix] Check sort options on memberlist to avoid a general error. (Bug #53655)</li>
! <li>[Change] Database updater now supports checking for existing/missing indexes.</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] Template engine now permits variable includes to a limited extent.</li>
Modified: branches/phpBB-3_0_0/phpBB/memberlist.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/memberlist.php (original)
--- branches/phpBB-3_0_0/phpBB/memberlist.php Sat Nov 7 13:33:19 2009
***************
*** 975,984 ****
$msn = request_var('msn', '');
$jabber = request_var('jabber', '');
$search_group_id = request_var('search_group_id', 0);
!
$joined_select = request_var('joined_select', 'lt');
$active_select = request_var('active_select', 'lt');
$count_select = request_var('count_select', 'eq');
$joined = explode('-', request_var('joined', ''));
$active = explode('-', request_var('active', ''));
$count = (request_var('count', '') !== '') ? request_var('count', 0) : '';
--- 975,986 ----
$msn = request_var('msn', '');
$jabber = request_var('jabber', '');
$search_group_id = request_var('search_group_id', 0);
!
! // when using these, make sure that actually have values defined in $find_key_match
$joined_select = request_var('joined_select', 'lt');
$active_select = request_var('active_select', 'lt');
$count_select = request_var('count_select', 'eq');
+
$joined = explode('-', request_var('joined', ''));
$active = explode('-', request_var('active', ''));
$count = (request_var('count', '') !== '') ? request_var('count', 0) : '';
***************
*** 1016,1024 ****
$sql_where .= ($yahoo) ? ' AND u.user_yim ' . $db->sql_like_expression(str_replace('*', $db->any_char, $yahoo)) . ' ' : '';
$sql_where .= ($msn) ? ' AND u.user_msnm ' . $db->sql_like_expression(str_replace('*', $db->any_char, $msn)) . ' ' : '';
$sql_where .= ($jabber) ? ' AND u.user_jabber ' . $db->sql_like_expression(str_replace('*', $db->any_char, $jabber)) . ' ' : '';
! $sql_where .= (is_numeric($count)) ? ' AND u.user_posts ' . $find_key_match[$count_select] . ' ' . (int) $count . ' ' : '';
! $sql_where .= (sizeof($joined) > 1) ? " AND u.user_regdate " . $find_key_match[$joined_select] . ' ' . gmmktime(0, 0, 0, intval($joined[1]), intval($joined[2]), intval($joined[0])) : '';
! $sql_where .= ($auth->acl_get('u_viewonline') && sizeof($active) > 1) ? " AND u.user_lastvisit " . $find_key_match[$active_select] . ' ' . gmmktime(0, 0, 0, $active[1], intval($active[2]), intval($active[0])) : '';
$sql_where .= ($search_group_id) ? " AND u.user_id = ug.user_id AND ug.group_id = $search_group_id AND ug.user_pending = 0 " : '';
if ($search_group_id)
--- 1018,1026 ----
$sql_where .= ($yahoo) ? ' AND u.user_yim ' . $db->sql_like_expression(str_replace('*', $db->any_char, $yahoo)) . ' ' : '';
$sql_where .= ($msn) ? ' AND u.user_msnm ' . $db->sql_like_expression(str_replace('*', $db->any_char, $msn)) . ' ' : '';
$sql_where .= ($jabber) ? ' AND u.user_jabber ' . $db->sql_like_expression(str_replace('*', $db->any_char, $jabber)) . ' ' : '';
! $sql_where .= (is_numeric($count) && isset($find_key_match[$count_select])) ? ' AND u.user_posts ' . $find_key_match[$count_select] . ' ' . (int) $count . ' ' : '';
! $sql_where .= (sizeof($joined) > 1 && isset($find_key_match[$joined_select])) ? " AND u.user_regdate " . $find_key_match[$joined_select] . ' ' . gmmktime(0, 0, 0, intval($joined[1]), intval($joined[2]), intval($joined[0])) : '';
! $sql_where .= ($auth->acl_get('u_viewonline') && sizeof($active) > 1 && isset($find_key_match[$active_select])) ? " AND u.user_lastvisit " . $find_key_match[$active_select] . ' ' . gmmktime(0, 0, 0, $active[1], intval($active[2]), intval($active[0])) : '';
$sql_where .= ($search_group_id) ? " AND u.user_id = ug.user_id AND ug.group_id = $search_group_id AND ug.user_pending = 0 " : '';
if ($search_group_id)
|
|
From: Meik S. <acy...@ph...> - 2009-11-06 14:59:48
|
Author: acydburn
Date: Fri Nov 6 14:59:02 2009
New Revision: 10255
Log:
simplify the js code a bit and also detect up arrow key for auto completion
Modified:
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/forum_fn.js
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/forum_fn.js
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/forum_fn.js (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/forum_fn.js Fri Nov 6 14:59:02 2009
***************
*** 321,336 ****
var last_key_entered = '';
/**
! * Usually used for onkeypress event, to submit a form on enter
*/
! function submit_default_button(event, selector, class_name)
{
! // Add which for key events
! if (!event.which && ((event.charCode || event.charCode === 0) ? event.charCode : event.keyCode))
! event.which = event.charCode || event.keyCode;
!
! // Keycode is array down?
! if (event.keyCode && event.keyCode == 40)
in_autocomplete = true;
// Make sure we are not within an "autocompletion" field
--- 321,332 ----
var last_key_entered = '';
/**
! * Check event key
*/
! function phpbb_check_key(event)
{
! // Keycode is array down or up?
! if (event.keyCode && (event.keyCode == 40 || event.keyCode == 38))
in_autocomplete = true;
// Make sure we are not within an "autocompletion" field
***************
*** 351,356 ****
--- 347,367 ----
return true;
}
+ return false;
+ }
+
+ /**
+ * Usually used for onkeypress event, to submit a form on enter
+ */
+ function submit_default_button(event, selector, class_name)
+ {
+ // Add which for key events
+ if (!event.which && ((event.charCode || event.charCode === 0) ? event.charCode : event.keyCode))
+ event.which = event.charCode || event.keyCode;
+
+ if (phpbb_set_autocomplete(event))
+ return true;
+
var current = selector['parentNode'];
// Search parent form element
***************
*** 394,413 ****
if (!default_button || default_button.length <= 0)
return true;
! // Keycode is array down?
! if (e.keyCode && e.keyCode == 40)
! in_autocomplete = true;
!
! // Make sure we are not within an "autocompletion" field
! if (in_autocomplete)
! {
! // If return pressed and key changed we reset the autocompletion
! if (!last_key_entered || last_key_entered == e.which)
! {
! in_autocompletion = false;
! return true;
! }
! }
if ((e.which && e.which == 13) || (e.keyCode && e.keyCode == 13))
{
--- 405,412 ----
if (!default_button || default_button.length <= 0)
return true;
! if (phpbb_check_key(e))
! return true;
if ((e.which && e.which == 13) || (e.keyCode && e.keyCode == 13))
{
***************
*** 415,422 ****
return false;
}
- last_key_entered = e.which;
-
return true;
});
--- 414,419 ----
|
|
From: Meik S. <acy...@ph...> - 2009-11-05 14:59:13
|
Author: acydburn
Date: Thu Nov 5 14:58:25 2009
New Revision: 10254
Log:
update to r10069 (try to detect auto completion on input fields and do not submit form if user uses enter key for auto completion instead of right arrow key)
Modified:
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/forum_fn.js
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/forum_fn.js
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/forum_fn.js (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/forum_fn.js Thu Nov 5 14:58:25 2009
***************
*** 317,322 ****
--- 317,325 ----
}
}
+ var in_autocomplete = false;
+ var last_key_entered = '';
+
/**
* Usually used for onkeypress event, to submit a form on enter
*/
***************
*** 326,334 ****
--- 329,355 ----
if (!event.which && ((event.charCode || event.charCode === 0) ? event.charCode : event.keyCode))
event.which = event.charCode || event.keyCode;
+ // Keycode is array down?
+ if (event.keyCode && event.keyCode == 40)
+ in_autocomplete = true;
+
+ // Make sure we are not within an "autocompletion" field
+ if (in_autocomplete)
+ {
+ // If return pressed and key changed we reset the autocompletion
+ if (!last_key_entered || last_key_entered == event.which)
+ {
+ in_autocompletion = false;
+ return true;
+ }
+ }
+
// Keycode is not return, then return. ;)
if (event.which != 13)
+ {
+ last_key_entered = event.which;
return true;
+ }
var current = selector['parentNode'];
***************
*** 373,384 ****
--- 394,422 ----
if (!default_button || default_button.length <= 0)
return true;
+ // Keycode is array down?
+ if (e.keyCode && e.keyCode == 40)
+ in_autocomplete = true;
+
+ // Make sure we are not within an "autocompletion" field
+ if (in_autocomplete)
+ {
+ // If return pressed and key changed we reset the autocompletion
+ if (!last_key_entered || last_key_entered == e.which)
+ {
+ in_autocompletion = false;
+ return true;
+ }
+ }
+
if ((e.which && e.which == 13) || (e.keyCode && e.keyCode == 13))
{
default_button.click();
return false;
}
+ last_key_entered = e.which;
+
return true;
});
|
|
From: Meik S. <acy...@ph...> - 2009-11-03 15:03:32
|
Author: acydburn
Date: Tue Nov 3 15:03:14 2009
New Revision: 10253
Log:
This is not perfect... i know, but at least it gives out more information than a simple "this topic/post does not exist". ;)
Related to r9971
Modified:
branches/phpBB-3_0_0/phpBB/posting.php
Modified: branches/phpBB-3_0_0/phpBB/posting.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/posting.php (original)
--- branches/phpBB-3_0_0/phpBB/posting.php Tue Nov 3 15:03:14 2009
***************
*** 95,102 ****
FROM ' . TOPICS_TABLE . ' t, ' . FORUMS_TABLE . " f
WHERE t.topic_id = $topic_id
AND (f.forum_id = t.forum_id
! OR f.forum_id = $forum_id)
! AND t.topic_approved = 1";
break;
case 'quote':
--- 95,102 ----
FROM ' . TOPICS_TABLE . ' t, ' . FORUMS_TABLE . " f
WHERE t.topic_id = $topic_id
AND (f.forum_id = t.forum_id
! OR f.forum_id = $forum_id)" .
! (($auth->acl_get('m_approve', $forum_id)) ? '' : 'AND t.topic_approved = 1');
break;
case 'quote':
***************
*** 125,131 ****
AND u.user_id = p.poster_id
AND (f.forum_id = t.forum_id
OR f.forum_id = $forum_id)" .
! (($auth->acl_get('m_approve', $forum_id) && $mode != 'quote') ? '' : 'AND p.post_approved = 1');
break;
case 'smilies':
--- 125,131 ----
AND u.user_id = p.poster_id
AND (f.forum_id = t.forum_id
OR f.forum_id = $forum_id)" .
! (($auth->acl_get('m_approve', $forum_id)) ? '' : 'AND p.post_approved = 1');
break;
case 'smilies':
***************
*** 171,176 ****
--- 171,183 ----
trigger_error(($mode == 'post' || $mode == 'bump' || $mode == 'reply') ? 'NO_TOPIC' : 'NO_POST');
}
+ // Not able to reply to unapproved posts/topics
+ // TODO: add more descriptive language key
+ if ($auth->acl_get('m_approve', $forum_id) && ((($mode == 'reply' || $mode == 'bump') && !$post_data['topic_approved']) || ($mode == 'quote' && !$post_data['post_approved'])))
+ {
+ trigger_error(($mode == 'reply' || $mode == 'bump') ? 'TOPIC_UNAPPROVED' : 'POST_UNAPPROVED');
+ }
+
if ($mode == 'popup')
{
upload_popup($post_data['forum_style']);
|
|
From: Meik S. <acy...@ph...> - 2009-11-03 14:51:54
|
Author: acydburn
Date: Tue Nov 3 14:51:07 2009
New Revision: 10252
Log:
Fix Bug #53545 - javascript error in template
Modified:
branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_queue.php
branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_reports.php
Modified: branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_queue.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_queue.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_queue.php Tue Nov 3 14:51:07 2009
***************
*** 105,110 ****
--- 105,111 ----
{
$template->assign_vars(array(
'S_TOPIC_REVIEW' => true,
+ 'S_BBCODE_ALLOWED' => $post_info['enable_bbcode'],
'TOPIC_TITLE' => $post_info['topic_title'])
);
}
Modified: branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_reports.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_reports.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_reports.php Tue Nov 3 14:51:07 2009
***************
*** 116,121 ****
--- 116,122 ----
{
$template->assign_vars(array(
'S_TOPIC_REVIEW' => true,
+ 'S_BBCODE_ALLOWED' => $post_info['enable_bbcode'],
'TOPIC_TITLE' => $post_info['topic_title'])
);
}
***************
*** 429,435 ****
'PAGE_NUMBER' => on_page($total, $config['topics_per_page'], $start),
'TOPIC_ID' => $topic_id,
'TOTAL' => $total,
! 'TOTAL_REPORTS' => ($total == 1) ? $user->lang['LIST_REPORT'] : sprintf($user->lang['LIST_REPORTS'], $total),
)
);
--- 430,436 ----
'PAGE_NUMBER' => on_page($total, $config['topics_per_page'], $start),
'TOPIC_ID' => $topic_id,
'TOTAL' => $total,
! 'TOTAL_REPORTS' => ($total == 1) ? $user->lang['LIST_REPORT'] : sprintf($user->lang['LIST_REPORTS'], $total),
)
);
***************
*** 671,677 ****
$messenger->send($reporter['user_notify_type']);
}
}
!
if (!$pm)
{
foreach ($post_info as $post)
--- 672,678 ----
$messenger->send($reporter['user_notify_type']);
}
}
!
if (!$pm)
{
foreach ($post_info as $post)
***************
*** 712,724 ****
{
$return_forum = sprintf($user->lang['RETURN_FORUM'], '<a href="' . append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . current($forum_ids)) . '">', '</a>') . '<br /><br />';
}
!
if (sizeof($topic_ids) === 1)
{
$return_topic = sprintf($user->lang['RETURN_TOPIC'], '<a href="' . append_sid("{$phpbb_root_path}viewtopic.$phpEx", 't=' . current($topic_ids) . '&f=' . current($forum_ids)) . '">', '</a>') . '<br /><br />';
}
}
!
trigger_error($user->lang[$success_msg] . '<br /><br />' . $return_forum . $return_topic . sprintf($user->lang['RETURN_PAGE'], "<a href=\"$redirect\">", '</a>'));
}
}
--- 713,725 ----
{
$return_forum = sprintf($user->lang['RETURN_FORUM'], '<a href="' . append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . current($forum_ids)) . '">', '</a>') . '<br /><br />';
}
!
if (sizeof($topic_ids) === 1)
{
$return_topic = sprintf($user->lang['RETURN_TOPIC'], '<a href="' . append_sid("{$phpbb_root_path}viewtopic.$phpEx", 't=' . current($topic_ids) . '&f=' . current($forum_ids)) . '">', '</a>') . '<br /><br />';
}
}
!
trigger_error($user->lang[$success_msg] . '<br /><br />' . $return_forum . $return_topic . sprintf($user->lang['RETURN_PAGE'], "<a href=\"$redirect\">", '</a>'));
}
}
|
|
From: Meik S. <acy...@ph...> - 2009-11-03 14:41:12
|
Author: acydburn
Date: Tue Nov 3 14:40:25 2009
New Revision: 10251
Log:
Fix Bug #53505 (related to Bug #52515 and r10208) - i fixed this the "do not break other things" way, usually the fix would be using !$submit here
Modified:
branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_compose.php
Modified: branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_compose.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_compose.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_compose.php Tue Nov 3 14:40:25 2009
***************
*** 811,817 ****
}
// Decode text for message display
! $bbcode_uid = (($action == 'quote' || $action == 'forward') && !$preview && !$refresh) ? $bbcode_uid : $message_parser->bbcode_uid;
$message_parser->decode_message($bbcode_uid);
--- 811,817 ----
}
// Decode text for message display
! $bbcode_uid = (($action == 'quote' || $action == 'forward') && !$preview && !$refresh && (!sizeof($error) || (sizeof($error) && !$submit))) ? $bbcode_uid : $message_parser->bbcode_uid;
$message_parser->decode_message($bbcode_uid);
|
|
From: Meik S. <acy...@ph...> - 2009-11-01 19:20:04
|
Author: acydburn
Date: Sun Nov 1 19:19:17 2009
New Revision: 10250
Log:
Tag phpBB Release Candidate 4
Added:
tags/release_3_0_6-RC4/
- copied from r10249, branches/phpBB-3_0_0/
|
|
From: Meik S. <acy...@ph...> - 2009-11-01 15:34:34
|
Author: acydburn
Date: Sun Nov 1 15:33:44 2009
New Revision: 10249
Log:
check for additional empty config variables...
Modified:
branches/phpBB-3_0_0/phpBB/includes/message_parser.php
Modified: branches/phpBB-3_0_0/phpBB/includes/message_parser.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/message_parser.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/message_parser.php Sun Nov 1 15:33:44 2009
***************
*** 1064,1080 ****
$this->mode = $mode;
! if (!isset($config['max_' . $mode . '_chars']))
! {
! $config['max_' . $mode . '_chars'] = 0;
! }
! if (!isset($config['max_' . $mode . '_smilies']))
! {
! $config['max_' . $mode . '_smilies'] = 0;
! }
! if (!isset($config['max_' . $mode . '_urls']))
{
! $config['max_' . $mode . '_urls'] = 0;
}
$this->allow_img_bbcode = $allow_img_bbcode;
--- 1064,1075 ----
$this->mode = $mode;
! foreach (array('chars', 'smilies', 'urls', 'font_size', 'img_height', 'img_width') as $key)
{
! if (!isset($config['max_' . $mode . '_' . $key]))
! {
! $config['max_' . $mode . '_' . $key] = 0;
! }
}
$this->allow_img_bbcode = $allow_img_bbcode;
|
|
From: Meik S. <acy...@ph...> - 2009-10-30 19:20:33
|
Author: acydburn
Date: Fri Oct 30 19:19:48 2009
New Revision: 10248
Log:
Several fixes:
Fix Bug #53335
Fix wrong unique index fetch for oracle and sqlite
Fix alter column definition for firebird (although the query will fail in these circumstances [primary key] because firebird (again) does not support simple things... although... mssql/oracle having the same "problems", but there you are able to do more advanced queries)
Modified:
branches/phpBB-3_0_0/phpBB/includes/db/db_tools.php
branches/phpBB-3_0_0/phpBB/install/database_update.php
Modified: branches/phpBB-3_0_0/phpBB/includes/db/db_tools.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/db/db_tools.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/db/db_tools.php Fri Oct 30 19:19:48 2009
***************
*** 1873,1879 ****
}
else
{
! $statements[] = 'ALTER TABLE ' . $table_name . ' ALTER COLUMN "' . strtoupper($column_name) . '" TYPE ' . ' ' . $column_data['column_type_sql'];
}
break;
--- 1873,1879 ----
}
else
{
! $statements[] = 'ALTER TABLE ' . $table_name . ' ALTER COLUMN "' . strtoupper($column_name) . '" TYPE ' . ' ' . $column_data['column_type_sql_type'];
}
break;
Modified: branches/phpBB-3_0_0/phpBB/install/database_update.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/database_update.php (original)
--- branches/phpBB-3_0_0/phpBB/install/database_update.php Fri Oct 30 19:19:48 2009
***************
*** 346,356 ****
$no_updates = false;
! $statements = $db_tools->perform_schema_changes($schema_changes);
!
! foreach ($statements as $sql)
{
! _sql($sql, $errored, $error_ary);
}
}
--- 346,360 ----
$no_updates = false;
! // We run one index after the other... to be consistent with schema changes...
! foreach ($schema_changes as $key => $changes)
{
! $statements = $db_tools->perform_schema_changes(array($key => $changes));
!
! foreach ($statements as $sql)
! {
! _sql($sql, $errored, $error_ary);
! }
}
}
***************
*** 716,721 ****
--- 720,728 ----
'session_forum_id' => array('UINT', 0),
),
),
+ 'drop_keys' => array(
+ GROUPS_TABLE => array('group_legend'),
+ ),
'add_index' => array(
SESSIONS_TABLE => array(
'session_forum_id' => array('session_forum_id'),
***************
*** 724,732 ****
'group_legend_name' => array('group_legend', 'group_name'),
),
),
- 'drop_keys' => array(
- GROUPS_TABLE => array('group_legend'),
- ),
),
// No changes from 3.0.1-RC1 to 3.0.1
'3.0.1-RC1' => array(),
--- 731,736 ----
***************
*** 1053,1062 ****
// Changes from 3.0.3-RC1 to 3.0.3
case '3.0.3-RC1':
! $sql = 'UPDATE ' . LOG_TABLE . "
! SET log_operation = 'LOG_DELETE_TOPIC'
! WHERE log_operation = 'LOG_TOPIC_DELETED'";
! _sql($sql, $errored, $error_ary);
$no_updates = false;
break;
--- 1057,1077 ----
// Changes from 3.0.3-RC1 to 3.0.3
case '3.0.3-RC1':
! if ($db->sql_layer == 'oracle')
! {
! // log_operation is CLOB - but we can change this later
! $sql = 'UPDATE ' . LOG_TABLE . "
! SET log_operation = 'LOG_DELETE_TOPIC'
! WHERE log_operation LIKE 'LOG_TOPIC_DELETED'";
! _sql($sql, $errored, $error_ary);
! }
! else
! {
! $sql = 'UPDATE ' . LOG_TABLE . "
! SET log_operation = 'LOG_DELETE_TOPIC'
! WHERE log_operation = 'LOG_TOPIC_DELETED'";
! _sql($sql, $errored, $error_ary);
! }
$no_updates = false;
break;
***************
*** 1199,1204 ****
--- 1214,1231 ----
'drop_keys' => array(
ACL_OPTIONS_TABLE => array('auth_option'),
),
+ );
+
+ global $db_tools;
+
+ $statements = $db_tools->perform_schema_changes($changes);
+
+ foreach ($statements as $sql)
+ {
+ _sql($sql, $errored, $error_ary);
+ }
+
+ $changes = array(
'add_unique_index' => array(
ACL_OPTIONS_TABLE => array(
'auth_option' => array('auth_option'),
***************
*** 1206,1213 ****
),
);
- global $db_tools;
-
$statements = $db_tools->perform_schema_changes($changes);
foreach ($statements as $sql)
--- 1233,1238 ----
***************
*** 2521,2533 ****
FROM user_indexes
WHERE table_name = '" . strtoupper($table_name) . "'
AND generated = 'N'
! AND uniqueness = 'UNIQUE'
! AND index_name LIKE 'U_%'";
$col = 'index_name';
break;
case 'sqlite':
! $sql = "PRAGMA index_list('" . $table_name . "') WHERE unique = 1;";
$col = 'name';
break;
}
--- 2546,2557 ----
FROM user_indexes
WHERE table_name = '" . strtoupper($table_name) . "'
AND generated = 'N'
! AND uniqueness = 'UNIQUE'";
$col = 'index_name';
break;
case 'sqlite':
! $sql = "PRAGMA index_list('" . $table_name . "');";
$col = 'name';
break;
}
***************
*** 2554,2560 ****
switch ($this->sql_layer)
{
case 'oracle':
! $row[$col] = substr($row[$col], strlen('U_' . $row['table_owner']) + 1);
break;
case 'firebird':
--- 2578,2592 ----
switch ($this->sql_layer)
{
case 'oracle':
! // Two cases here... prefixed with U_[table_owner] and not prefixed with table_name
! if (strpos($row[$col], 'U_') === 0)
! {
! $row[$col] = substr($row[$col], strlen('U_' . $row['table_owner']) + 1);
! }
! else if (strpos($row[$col], strtoupper($table_name)) === 0)
! {
! $row[$col] = substr($row[$col], strlen($table_name) + 1);
! }
break;
case 'firebird':
***************
*** 3228,3234 ****
}
else
{
! $statements[] = 'ALTER TABLE ' . $table_name . ' ALTER COLUMN "' . strtoupper($column_name) . '" TYPE ' . ' ' . $column_data['column_type_sql'];
}
break;
--- 3260,3267 ----
}
else
{
! // TODO: try to change pkey without removing trigger, generator or constraints. ATM this query may fail.
! $statements[] = 'ALTER TABLE ' . $table_name . ' ALTER COLUMN "' . strtoupper($column_name) . '" TYPE ' . ' ' . $column_data['column_type_sql_type'];
}
break;
|
7 messages has been excluded from this view by a project administrator.
