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-10-13 12:28:51
|
Author: acydburn
Date: Tue Oct 13 13:27:40 2009
New Revision: 10222
Log:
Tag phpBB 3.0.6-RC3
Added:
tags/release_3_0_6-RC3/
- copied from r10221, branches/phpBB-3_0_0/
|
|
From: Meik S. <acy...@ph...> - 2009-10-12 14:16:56
|
Author: acydburn
Date: Mon Oct 12 15:16:09 2009
New Revision: 10221
Log:
remove unused closing div tag (Bug #52735)
Modified:
branches/phpBB-3_0_0/phpBB/feed.php
Modified: branches/phpBB-3_0_0/phpBB/feed.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/feed.php (original)
--- branches/phpBB-3_0_0/phpBB/feed.php Mon Oct 12 15:16:09 2009
***************
*** 196,202 ****
echo '<p>' . $user->lang['STATISTICS'] . ': ' . $row['statistics'] . '</p>';
}
! echo '<hr /></div>' . "\n" . ']]></content>' . "\n";
echo '</entry>' . "\n";
}
--- 196,202 ----
echo '<p>' . $user->lang['STATISTICS'] . ': ' . $row['statistics'] . '</p>';
}
! echo '<hr />' . "\n" . ']]></content>' . "\n";
echo '</entry>' . "\n";
}
|
|
From: Meik S. <acy...@ph...> - 2009-10-11 09:57:37
|
Author: acydburn
Date: Sun Oct 11 10:56:47 2009
New Revision: 10220
Log:
update constants and schema data from RC2 to RC3
Modified:
branches/phpBB-3_0_0/phpBB/includes/constants.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 Sun Oct 11 10:56:47 2009
***************
*** 25,31 ****
*/
// phpBB Version
! define('PHPBB_VERSION', '3.0.6-RC2');
// QA-related
// define('PHPBB_QA', 1);
--- 25,31 ----
*/
// phpBB Version
! define('PHPBB_VERSION', '3.0.6-RC3');
// QA-related
// define('PHPBB_QA', 1);
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 Sun Oct 11 10:56:47 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-RC2');
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-RC3');
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-10-11 09:57:03
|
Author: acydburn
Date: Sun Oct 11 10:56:11 2009
New Revision: 10219
Log:
update mysql_upgrader to latest schema
Modified:
branches/phpBB-3_0_0/phpBB/develop/mysql_upgrader.php
Modified: branches/phpBB-3_0_0/phpBB/develop/mysql_upgrader.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/develop/mysql_upgrader.php (original)
--- branches/phpBB-3_0_0/phpBB/develop/mysql_upgrader.php Sun Oct 11 10:56:11 2009
***************
*** 796,801 ****
--- 796,802 ----
'poster_ip' => array('INDEX', 'poster_ip'),
'poster_id' => array('INDEX', 'poster_id'),
'post_approved' => array('INDEX', 'post_approved'),
+ 'post_username' => array('INDEX', 'post_username'),
'tid_post_time' => array('INDEX', array('topic_id', 'post_time')),
),
);
|
|
From: Meik S. <acy...@ph...> - 2009-10-09 12:00:43
|
Author: acydburn Date: Fri Oct 9 12:59:54 2009 New Revision: 10218 Log: correctly execute database update step (detect if the version the admin wants to update to is greater than the current version even if phpbb.com says the current version is lower than the update version) which correctly updates the database for those who forgot to enable the PHPBB_QA constant for release candidates. 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 Fri Oct 9 12:59:54 2009 *************** *** 262,267 **** --- 262,277 ---- $template->assign_var('PACKAGE_VERSION', $this->update_info['version']['to']); } + // Since some people try to update to RC releases, but phpBB.com tells them the last version is the version they currently run + // we are faced with the updater thinking the database schema is up-to-date; which it is, but should be updated none-the-less + // We now try to cope with this by triggering the update process + if (version_compare(str_replace('rc', 'RC', strtolower($this->current_version)), str_replace('rc', 'RC', strtolower($this->update_info['version']['to'])), '<')) + { + $template->assign_vars(array( + 'S_UP_TO_DATE' => false, + )); + } + break; case 'update_db': |
|
From: Meik S. <acy...@ph...> - 2009-10-09 11:13:24
|
Author: acydburn
Date: Fri Oct 9 12:12:37 2009
New Revision: 10217
Log:
fix bug #52605 - regression from r9811
Modified:
branches/phpBB-3_0_0/phpBB/includes/template.php
Modified: branches/phpBB-3_0_0/phpBB/includes/template.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/template.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/template.php Fri Oct 9 12:12:37 2009
***************
*** 152,157 ****
--- 152,158 ----
function destroy()
{
$this->_tpldata = array('.' => array(0 => array()));
+ $this->_rootref = &$this->_tpldata['.'][0];
}
/**
|
|
From: Chris S. <too...@ph...> - 2009-10-07 14:54:57
|
Author: toonarmy
Date: Wed Oct 7 15:54:10 2009
New Revision: 10216
Log:
Properly fix #40925
Modified:
branches/phpBB-3_0_0/phpBB/includes/acp/acp_profile.php
branches/phpBB-3_0_0/phpBB/includes/functions_profile_fields.php
Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_profile.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_profile.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_profile.php Wed Oct 7 15:54:10 2009
***************
*** 509,514 ****
--- 509,522 ----
// Get the number of options if this key is 'field_maxlen'
$var = request_var('field_default_value', 0);
}*/
+ else if ($field_type == FIELD_INT && $key == 'field_default_value')
+ {
+ // Permit an empty string
+ if (request_var('field_default_value', '') === '')
+ {
+ $var = '';
+ }
+ }
$cp->vars[$key] = $var;
}
Modified: branches/phpBB-3_0_0/phpBB/includes/functions_profile_fields.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_profile_fields.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_profile_fields.php Wed Oct 7 15:54:10 2009
***************
*** 624,630 ****
}
else
{
! if (!$preview && isset($user->profile_fields[$user_ident]) && is_null($user->profile_fields[$user_ident]))
{
$value = NULL;
}
--- 624,630 ----
}
else
{
! if (!$preview && array_key_exists($user_ident, $user->profile_fields) && is_null($user->profile_fields[$user_ident]))
{
$value = NULL;
}
|
|
From: Meik S. <acy...@ph...> - 2009-10-06 13:40:19
|
Author: acydburn
Date: Tue Oct 6 14:40:01 2009
New Revision: 10215
Log:
(a little test for later merges)
reintegrate branch into trunk (r10214)
Modified:
trunk/phpBB/ (props changed)
trunk/phpBB/includes/functions_user.php
trunk/phpBB/includes/template.php
Propchange: trunk/phpBB/
------------------------------------------------------------------------------
svn:mergeinfo = /branches/phpBB-3_0_0/phpBB:10211-10214
Modified: trunk/phpBB/includes/functions_user.php
==============================================================================
*** trunk/phpBB/includes/functions_user.php (original)
--- trunk/phpBB/includes/functions_user.php Tue Oct 6 14:40:01 2009
***************
*** 2832,2842 ****
if ($config['coppa_enable'])
{
! $group_order = array('ADMINISTRATORS', 'GLOBAL_MODERATORS', 'REGISTERED_COPPA', 'REGISTERED', 'BOTS', 'GUESTS');
}
else
{
! $group_order = array('ADMINISTRATORS', 'GLOBAL_MODERATORS', 'REGISTERED', 'BOTS', 'GUESTS');
}
// We need both username and user_id info
--- 2832,2842 ----
if ($config['coppa_enable'])
{
! $group_order = array('ADMINISTRATORS', 'GLOBAL_MODERATORS', 'NEWLY_REGISTERED', 'REGISTERED_COPPA', 'REGISTERED', 'BOTS', 'GUESTS');
}
else
{
! $group_order = array('ADMINISTRATORS', 'GLOBAL_MODERATORS', 'NEWLY_REGISTERED', 'REGISTERED', 'BOTS', 'GUESTS');
}
// We need both username and user_id info
Modified: trunk/phpBB/includes/template.php
==============================================================================
*** trunk/phpBB/includes/template.php (original)
--- trunk/phpBB/includes/template.php Tue Oct 6 14:40:01 2009
***************
*** 248,255 ****
{
global $user, $phpEx, $config;
$filename = $this->cachepath . str_replace('/', '.', $this->filename[$handle]) . '.' . $phpEx;
! $this->files_template[$handle] = $user->theme['template_id'];
$recompile = false;
if (!file_exists($filename) || @filesize($filename) === 0)
--- 248,260 ----
{
global $user, $phpEx, $config;
+ if (!isset($this->filename[$handle]))
+ {
+ trigger_error("template->_tpl_load(): No file specified for handle $handle", E_USER_ERROR);
+ }
+
$filename = $this->cachepath . str_replace('/', '.', $this->filename[$handle]) . '.' . $phpEx;
! $this->files_template[$handle] = (isset($user->theme['template_id'])) ? $user->theme['template_id'] : 0;
$recompile = false;
if (!file_exists($filename) || @filesize($filename) === 0)
|
|
From: Meik S. <acy...@ph...> - 2009-10-05 17:55:36
|
Author: acydburn
Date: Mon Oct 5 18:54:55 2009
New Revision: 10214
Log:
Bug #52525
Modified:
branches/phpBB-3_0_0/phpBB/includes/functions_user.php
Modified: branches/phpBB-3_0_0/phpBB/includes/functions_user.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_user.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_user.php Mon Oct 5 18:54:55 2009
***************
*** 2832,2842 ****
if ($config['coppa_enable'])
{
! $group_order = array('ADMINISTRATORS', 'GLOBAL_MODERATORS', 'REGISTERED_COPPA', 'REGISTERED', 'BOTS', 'GUESTS');
}
else
{
! $group_order = array('ADMINISTRATORS', 'GLOBAL_MODERATORS', 'REGISTERED', 'BOTS', 'GUESTS');
}
// We need both username and user_id info
--- 2832,2842 ----
if ($config['coppa_enable'])
{
! $group_order = array('ADMINISTRATORS', 'GLOBAL_MODERATORS', 'NEWLY_REGISTERED', 'REGISTERED_COPPA', 'REGISTERED', 'BOTS', 'GUESTS');
}
else
{
! $group_order = array('ADMINISTRATORS', 'GLOBAL_MODERATORS', 'NEWLY_REGISTERED', 'REGISTERED', 'BOTS', 'GUESTS');
}
// We need both username and user_id info
|
|
From: Meik S. <acy...@ph...> - 2009-10-05 16:22:38
|
Author: acydburn
Date: Mon Oct 5 17:22:21 2009
New Revision: 10213
Log:
bugfix for non-existent handles and theme data (we really need to clean this up, template_files feels quite furry)
Modified:
branches/phpBB-3_0_0/phpBB/includes/template.php
Modified: branches/phpBB-3_0_0/phpBB/includes/template.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/template.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/template.php Mon Oct 5 17:22:21 2009
***************
*** 248,255 ****
{
global $user, $phpEx, $config;
$filename = $this->cachepath . str_replace('/', '.', $this->filename[$handle]) . '.' . $phpEx;
! $this->files_template[$handle] = $user->theme['template_id'];
$recompile = false;
if (!file_exists($filename) || @filesize($filename) === 0)
--- 248,260 ----
{
global $user, $phpEx, $config;
+ if (!isset($this->filename[$handle]))
+ {
+ trigger_error("template->_tpl_load(): No file specified for handle $handle", E_USER_ERROR);
+ }
+
$filename = $this->cachepath . str_replace('/', '.', $this->filename[$handle]) . '.' . $phpEx;
! $this->files_template[$handle] = (isset($user->theme['template_id'])) ? $user->theme['template_id'] : 0;
$recompile = false;
if (!file_exists($filename) || @filesize($filename) === 0)
|
|
From: Meik S. <acy...@ph...> - 2009-10-05 16:16:44
|
Author: acydburn
Date: Mon Oct 5 17:15:54 2009
New Revision: 10212
Log:
adjust tests a little bit to let them work again in trunk (not adjusted template/bbcode yet)
Modified:
trunk/tests/all_tests.php
trunk/tests/request/all_tests.php
trunk/tests/request/request_var.php
trunk/tests/security/all_tests.php
trunk/tests/security/extract_current_page.php
trunk/tests/security/redirect.php
trunk/tests/template/all_tests.php
trunk/tests/template/template.php
trunk/tests/test_framework/framework.php
trunk/tests/text_processing/all_tests.php
trunk/tests/text_processing/make_clickable.php
trunk/tests/utf/all_tests.php
trunk/tests/utf/utf8_clean_string_test.php
trunk/tests/utf/utf8_wordwrap_test.php
Modified: trunk/tests/all_tests.php
==============================================================================
*** trunk/tests/all_tests.php (original)
--- trunk/tests/all_tests.php Mon Oct 5 17:15:54 2009
***************
*** 8,15 ****
*
*/
- define('IN_PHPBB', true);
-
if (!defined('PHPUnit_MAIN_METHOD'))
{
define('PHPUnit_MAIN_METHOD', 'phpbb_all_tests::main');
--- 8,13 ----
***************
*** 18,28 ****
require_once 'test_framework/framework.php';
require_once 'PHPUnit/TextUI/TestRunner.php';
- require_once 'bbcode/all_tests.php';
require_once 'utf/all_tests.php';
require_once 'request/all_tests.php';
require_once 'security/all_tests.php';
! require_once 'template/all_tests.php';
require_once 'text_processing/all_tests.php';
// exclude the test directory from code coverage reports
--- 16,26 ----
require_once 'test_framework/framework.php';
require_once 'PHPUnit/TextUI/TestRunner.php';
require_once 'utf/all_tests.php';
require_once 'request/all_tests.php';
require_once 'security/all_tests.php';
! #require_once 'template/all_tests.php';
! #require_once 'bbcode/all_tests.php';
require_once 'text_processing/all_tests.php';
// exclude the test directory from code coverage reports
***************
*** 39,50 ****
{
$suite = new PHPUnit_Framework_TestSuite('phpBB');
! $suite->addTest(phpbb_bbcode_all_tests::suite());
$suite->addTest(phpbb_request_all_tests::suite());
$suite->addTest(phpbb_security_all_tests::suite());
! $suite->addTest(phpbb_template_all_tests::suite());
$suite->addTest(phpbb_text_processing_all_tests::suite());
- $suite->addTest(phpbb_utf_all_tests::suite());
return $suite;
}
--- 37,48 ----
{
$suite = new PHPUnit_Framework_TestSuite('phpBB');
! $suite->addTest(phpbb_utf_all_tests::suite());
$suite->addTest(phpbb_request_all_tests::suite());
$suite->addTest(phpbb_security_all_tests::suite());
! # $suite->addTest(phpbb_template_all_tests::suite());
! # $suite->addTest(phpbb_bbcode_all_tests::suite());
$suite->addTest(phpbb_text_processing_all_tests::suite());
return $suite;
}
***************
*** 54,58 ****
{
phpbb_all_tests::main();
}
-
- ?>
\ No newline at end of file
--- 52,54 ----
Modified: trunk/tests/request/all_tests.php
==============================================================================
*** trunk/tests/request/all_tests.php (original)
--- trunk/tests/request/all_tests.php Mon Oct 5 17:15:54 2009
***************
*** 8,15 ****
*
*/
- define('IN_PHPBB', true);
-
if (!defined('PHPUnit_MAIN_METHOD'))
{
define('PHPUnit_MAIN_METHOD', 'phpbb_request_all_tests::main');
--- 8,13 ----
***************
*** 19,25 ****
require_once 'PHPUnit/TextUI/TestRunner.php';
require_once 'request/request_var.php';
- require_once 'request/request_class.php';
class phpbb_request_all_tests
{
--- 17,22 ----
***************
*** 32,38 ****
{
$suite = new PHPUnit_Framework_TestSuite('phpBB Request Parameter Handling');
- $suite->addTestSuite('phpbb_request_request_class_test');
$suite->addTestSuite('phpbb_request_request_var_test');
return $suite;
--- 29,34 ----
Modified: trunk/tests/request/request_var.php
==============================================================================
*** trunk/tests/request/request_var.php (original)
--- trunk/tests/request/request_var.php Mon Oct 5 17:15:54 2009
***************
*** 8,17 ****
*
*/
- define('IN_PHPBB', true);
-
require_once 'test_framework/framework.php';
-
require_once '../phpBB/includes/functions.php';
class phpbb_request_request_var_test extends phpbb_test_case
--- 8,14 ----
***************
*** 22,34 ****
public function test_post($variable_value, $default, $multibyte, $expected)
{
$variable_name = 'name';
$_POST[$variable_name] = $variable_value;
$_REQUEST[$variable_name] = $variable_value;
- // reread data from super globals
- request::reset();
-
$result = request_var($variable_name, $default, $multibyte);
$label = 'Requesting POST variable, converting from ' . gettype($variable_value) . ' to ' . gettype($default) . (($multibyte) ? ' multibyte' : '');
--- 19,29 ----
public function test_post($variable_value, $default, $multibyte, $expected)
{
$variable_name = 'name';
+ $this->unset_variables($variable_name);
$_POST[$variable_name] = $variable_value;
$_REQUEST[$variable_name] = $variable_value;
$result = request_var($variable_name, $default, $multibyte);
$label = 'Requesting POST variable, converting from ' . gettype($variable_value) . ' to ' . gettype($default) . (($multibyte) ? ' multibyte' : '');
***************
*** 41,53 ****
public function test_get($variable_value, $default, $multibyte, $expected)
{
$variable_name = 'name';
$_GET[$variable_name] = $variable_value;
$_REQUEST[$variable_name] = $variable_value;
- // reread data from super globals
- request::reset();
-
$result = request_var($variable_name, $default, $multibyte);
$label = 'Requesting GET variable, converting from ' . gettype($variable_value) . ' to ' . gettype($default) . (($multibyte) ? ' multibyte' : '');
--- 36,46 ----
public function test_get($variable_value, $default, $multibyte, $expected)
{
$variable_name = 'name';
+ $this->unset_variables($variable_name);
$_GET[$variable_name] = $variable_value;
$_REQUEST[$variable_name] = $variable_value;
$result = request_var($variable_name, $default, $multibyte);
$label = 'Requesting GET variable, converting from ' . gettype($variable_value) . ' to ' . gettype($default) . (($multibyte) ? ' multibyte' : '');
***************
*** 55,64 ****
}
/**
! * @dataProvider deep_access
*/
public function test_deep_multi_dim_array_access($path, $default, $expected)
{
$_REQUEST['var'] = array(
0 => array(
'b' => array(
--- 48,86 ----
}
/**
! * @dataProvider request_variables
*/
+ public function test_cookie($variable_value, $default, $multibyte, $expected)
+ {
+ $variable_name = 'name';
+ $this->unset_variables($variable_name);
+
+ $_GET[$variable_name] = false;
+ $_POST[$variable_name] = false;
+ $_REQUEST[$variable_name] = false;
+ $_COOKIE[$variable_name] = $variable_value;
+
+ $result = request_var($variable_name, $default, $multibyte, true);
+
+ $label = 'Requesting COOKIE variable, converting from ' . gettype($variable_value) . ' to ' . gettype($default) . (($multibyte) ? ' multibyte' : '');
+ $this->assertEquals($expected, $result, $label);
+ }
+
+ /**
+ * Helper for unsetting globals
+ */
+ private function unset_variables($var)
+ {
+ unset($_GET[$var], $_POST[$var], $_REQUEST[$var], $_COOKIE[$var]);
+ }
+
+ /**
+ * @dataProvider deep_access
+ * Only possible with 3.1.x (later)
public function test_deep_multi_dim_array_access($path, $default, $expected)
{
+ $this->unset_variables('var');
+
$_REQUEST['var'] = array(
0 => array(
'b' => array(
***************
*** 75,83 ****
),
);
- // reread data from super globals
- request::reset();
-
$result = request_var($path, $default);
$this->assertEquals($expected, $result, 'Testing deep access to multidimensional input arrays: ' . $path);
}
--- 97,102 ----
***************
*** 92,98 ****
array(array('var', 0, 'b', true), array(0 => ''), array(5 => 'c', 6 => 'd')),
);
}
!
public static function request_variables()
{
return array(
--- 111,117 ----
array(array('var', 0, 'b', true), array(0 => ''), array(5 => 'c', 6 => 'd')),
);
}
! */
public static function request_variables()
{
return array(
***************
*** 193,198 ****
--- 212,218 ----
'abc' => array()
)
),
+ /* 3-dimensional (not supported atm!
array(
// input:
array(
***************
*** 237,242 ****
--- 257,263 ----
'ä' => array(4 => array('a' => 2, 'ö' => 3)),
)
),
+ */
);
}
Modified: trunk/tests/security/all_tests.php
==============================================================================
*** trunk/tests/security/all_tests.php (original)
--- trunk/tests/security/all_tests.php Mon Oct 5 17:15:54 2009
***************
*** 8,15 ****
*
*/
- define('IN_PHPBB', true);
-
if (!defined('PHPUnit_MAIN_METHOD'))
{
define('PHPUnit_MAIN_METHOD', 'phpbb_security_all_tests::main');
--- 8,13 ----
***************
*** 28,34 ****
*/
protected function setUp()
{
! global $user;
// Put this into a global function being run by every test to init a proper user session
$_SERVER['HTTP_HOST'] = 'localhost';
--- 26,32 ----
*/
protected function setUp()
{
! global $user, $phpbb_root_path;
// Put this into a global function being run by every test to init a proper user session
$_SERVER['HTTP_HOST'] = 'localhost';
***************
*** 57,63 ****
$user->referer = (!empty($_SERVER['HTTP_REFERER'])) ? htmlspecialchars((string) $_SERVER['HTTP_REFERER']) : '';
$user->forwarded_for = (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) ? (string) $_SERVER['HTTP_X_FORWARDED_FOR'] : '';
$user->host = (!empty($_SERVER['HTTP_HOST'])) ? (string) strtolower($_SERVER['HTTP_HOST']) : ((!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : getenv('SERVER_NAME'));
! $user->page = session::extract_current_page(PHPBB_ROOT_PATH);
}
protected function tearDown()
--- 55,61 ----
$user->referer = (!empty($_SERVER['HTTP_REFERER'])) ? htmlspecialchars((string) $_SERVER['HTTP_REFERER']) : '';
$user->forwarded_for = (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) ? (string) $_SERVER['HTTP_X_FORWARDED_FOR'] : '';
$user->host = (!empty($_SERVER['HTTP_HOST'])) ? (string) strtolower($_SERVER['HTTP_HOST']) : ((!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : getenv('SERVER_NAME'));
! $user->page = session::extract_current_page($phpbb_root_path);
}
protected function tearDown()
Modified: trunk/tests/security/extract_current_page.php
==============================================================================
*** trunk/tests/security/extract_current_page.php (original)
--- trunk/tests/security/extract_current_page.php Mon Oct 5 17:15:54 2009
***************
*** 8,15 ****
*
*/
- define('IN_PHPBB', true);
-
require_once 'test_framework/framework.php';
require_once '../phpBB/includes/functions.php';
--- 8,13 ----
***************
*** 53,57 ****
$this->assertEquals($expected, $result['query_string'], $label);
}
}
-
- ?>
\ No newline at end of file
--- 51,53 ----
Modified: trunk/tests/security/redirect.php
==============================================================================
*** trunk/tests/security/redirect.php (original)
--- trunk/tests/security/redirect.php Mon Oct 5 17:15:54 2009
***************
*** 8,20 ****
*
*/
- define('IN_PHPBB', true);
-
require_once 'test_framework/framework.php';
- define('PHPBB_ROOT_PATH', './../phpBB/');
- define('PHP_EXT', 'php');
-
require_once '../phpBB/includes/functions.php';
require_once '../phpBB/includes/session.php';
--- 8,15 ----
***************
*** 36,42 ****
protected function setUp()
{
$GLOBALS['config'] = array(
! 'force_server_vars' => 0,
);
}
--- 31,37 ----
protected function setUp()
{
$GLOBALS['config'] = array(
! 'force_server_vars' => '0',
);
}
***************
*** 61,65 ****
}
}
}
-
- ?>
\ No newline at end of file
--- 56,58 ----
Modified: trunk/tests/template/all_tests.php
==============================================================================
*** trunk/tests/template/all_tests.php (original)
--- trunk/tests/template/all_tests.php Mon Oct 5 17:15:54 2009
***************
*** 8,15 ****
*
*/
- define('IN_PHPBB', true);
-
if (!defined('PHPUnit_MAIN_METHOD'))
{
define('PHPUnit_MAIN_METHOD', 'phpbb_template_all_tests::main');
--- 8,13 ----
***************
*** 40,44 ****
if (PHPUnit_MAIN_METHOD == 'phpbb_template_all_tests::main')
{
phpbb_template_all_tests::main();
! }
! ?>
\ No newline at end of file
--- 38,41 ----
if (PHPUnit_MAIN_METHOD == 'phpbb_template_all_tests::main')
{
phpbb_template_all_tests::main();
! }
\ No newline at end of file
Modified: trunk/tests/template/template.php
==============================================================================
*** trunk/tests/template/template.php (original)
--- trunk/tests/template/template.php Mon Oct 5 17:15:54 2009
***************
*** 8,20 ****
*
*/
- define('IN_PHPBB', true);
- define('PHP_EXT', 'php');
- define('PHPBB_ROOT_PATH', '../phpBB/');
-
require_once 'test_framework/framework.php';
! require_once '../phpBB/includes/core/bootstrap.php';
class phpbb_template_template_test extends phpbb_test_case
{
--- 8,16 ----
*
*/
require_once 'test_framework/framework.php';
! require_once '../phpBB/includes/template.php';
class phpbb_template_template_test extends phpbb_test_case
{
***************
*** 22,28 ****
private $template_path;
// Keep the contents of the cache for debugging?
! const PRESERVE_CACHE = true;
private function display($handle)
{
--- 18,24 ----
private $template_path;
// Keep the contents of the cache for debugging?
! const PRESERVE_CACHE = false;
private function display($handle)
{
***************
*** 39,45 ****
private function setup_engine()
{
$this->template_path = dirname(__FILE__) . '/templates';
! $this->template = new phpbb_template;
$this->template->set_custom_template($this->template_path, 'tests');
}
--- 35,41 ----
private function setup_engine()
{
$this->template_path = dirname(__FILE__) . '/templates';
! $this->template = new template();
$this->template->set_custom_template($this->template_path, 'tests');
}
***************
*** 58,64 ****
unlink($file);
}
! phpbb::$config = array(
'load_tplcompile' => true,
'tpl_allow_php' => false,
);
--- 54,60 ----
unlink($file);
}
! $GLOBALS['config'] = array(
'load_tplcompile' => true,
'tpl_allow_php' => false,
);
***************
*** 269,329 ****
$this->assertFileNotExists($this->template_path . '/' . $filename, 'Testing missing file, file cannot exist');
$expecting = sprintf('template->_tpl_load_file(): File %s does not exist or is empty', realpath($this->template_path) . '/' . $filename);
! try
! {
! $this->display('test');
! }
! catch (ErrorException $e)
! {
! $this->assertEquals($expecting, $e->getMessage());
!
! if ($expecting != $e->getMessage())
! {
! // Unrelated error message throw it out
! throw $e;
! }
! }
}
public function test_empty_file()
{
$expecting = 'template->set_filenames: Empty filename specified for test';
! try
! {
! $this->template->set_filenames(array('test' => ''));
! }
! catch (ErrorException $e)
! {
! $this->assertEquals($expecting, $e->getMessage());
!
! if ($expecting != $e->getMessage())
! {
! // Unrelated error message throw it out
! throw $e;
! }
! }
}
public function test_invalid_handle()
{
$expecting = 'template->_tpl_load(): No file specified for handle test';
! try
! {
! $this->display('test');
! }
! catch (ErrorException $e)
! {
! $this->assertEquals($expecting, $e->getMessage());
!
! if ($expecting != $e->getMessage())
! {
! // Unrelated error message throw it out
! throw $e;
! }
! }
}
private function run_template($file, array $vars, array $block_vars, array $destroy, $expected, $cache_file)
--- 265,289 ----
$this->assertFileNotExists($this->template_path . '/' . $filename, 'Testing missing file, file cannot exist');
$expecting = sprintf('template->_tpl_load_file(): File %s does not exist or is empty', realpath($this->template_path) . '/' . $filename);
+ $this->setExpectedTriggerError(E_USER_ERROR, $expecting);
! $this->display('test');
}
public function test_empty_file()
{
$expecting = 'template->set_filenames: Empty filename specified for test';
! $this->setExpectedTriggerError(E_USER_ERROR, $expecting);
! $this->template->set_filenames(array('test' => ''));
}
public function test_invalid_handle()
{
$expecting = 'template->_tpl_load(): No file specified for handle test';
+ $this->setExpectedTriggerError(E_USER_ERROR, $expecting);
! $this->display('test');
}
private function run_template($file, array $vars, array $block_vars, array $destroy, $expected, $cache_file)
***************
*** 371,377 ****
*/
public function test_template($file, array $vars, array $block_vars, array $destroy, $expected)
{
! $cache_file = $this->template->cachepath . str_replace('/', '.', $file) . '.' . PHP_EXT;
$this->assertFileNotExists($cache_file);
--- 331,338 ----
*/
public function test_template($file, array $vars, array $block_vars, array $destroy, $expected)
{
! global $phpEx;
! $cache_file = $this->template->cachepath . str_replace('/', '.', $file) . '.' . $phpEx;
$this->assertFileNotExists($cache_file);
***************
*** 385,391 ****
/**
* @dataProvider template_data
- */
public function test_assign_display($file, array $vars, array $block_vars, array $destroy, $expected)
{
$this->template->set_filenames(array(
--- 346,351 ----
***************
*** 415,430 ****
public function test_php()
{
! phpbb::$config['tpl_allow_php'] = true;
! $cache_file = $this->template->cachepath . 'php.html.' . PHP_EXT;
$this->assertFileNotExists($cache_file);
$this->run_template('php.html', array(), array(), array(), 'test', $cache_file);
! phpbb::$config['tpl_allow_php'] = false;
}
/*
public function test_includephp()
{
--- 375,393 ----
public function test_php()
{
! global $phpEx;
! $GLOBALS['config']['tpl_allow_php'] = true;
!
! $cache_file = $this->template->cachepath . 'php.html.' . $phpEx;
$this->assertFileNotExists($cache_file);
$this->run_template('php.html', array(), array(), array(), 'test', $cache_file);
! $GLOBALS['config']['tpl_allow_php'] = false;
}
+ */
/*
public function test_includephp()
{
***************
*** 678,684 ****
/**
* @dataProvider alter_block_array_data
- */
public function test_alter_block_array($alter_block, array $vararray, $key, $mode, $expect, $description)
{
$this->template->set_filenames(array('test' => 'loop_nested.html'));
--- 641,646 ----
***************
*** 700,704 ****
$this->template->alter_block_array($alter_block, $vararray, $key, $mode);
$this->assertEquals($expect, $this->display('test'), $description);
}
}
- ?>
\ No newline at end of file
--- 662,666 ----
$this->template->alter_block_array($alter_block, $vararray, $key, $mode);
$this->assertEquals($expect, $this->display('test'), $description);
}
+ */
}
Modified: trunk/tests/test_framework/framework.php
==============================================================================
*** trunk/tests/test_framework/framework.php (original)
--- trunk/tests/test_framework/framework.php Mon Oct 5 17:15:54 2009
***************
*** 1,5 ****
--- 1,23 ----
<?php
+ define('IN_PHPBB', true);
+ $phpbb_root_path = '../phpBB/';
+ $phpEx = 'php';
+ $table_prefix = '';
+
+ // If we are on PHP >= 6.0.0 we do not need some code
+ if (version_compare(PHP_VERSION, '6.0.0-dev', '>='))
+ {
+ define('STRIP', false);
+ }
+ else
+ {
+ @set_magic_quotes_runtime(0);
+ define('STRIP', (get_magic_quotes_gpc()) ? true : false);
+ }
+
+ require_once $phpbb_root_path . 'includes/constants.php';
+
// require at least PHPUnit 3.3.0
require_once 'PHPUnit/Runner/Version.php';
if (version_compare(PHPUnit_Runner_Version::id(), '3.3.0', '<'))
Modified: trunk/tests/text_processing/all_tests.php
==============================================================================
*** trunk/tests/text_processing/all_tests.php (original)
--- trunk/tests/text_processing/all_tests.php Mon Oct 5 17:15:54 2009
***************
*** 8,15 ****
*
*/
- define('IN_PHPBB', true);
-
if (!defined('PHPUnit_MAIN_METHOD'))
{
define('PHPUnit_MAIN_METHOD', 'phpbb_text_processing_all_tests::main');
--- 8,13 ----
***************
*** 41,44 ****
{
phpbb_text_processing_all_tests::main();
}
- ?>
\ No newline at end of file
--- 39,41 ----
Modified: trunk/tests/text_processing/make_clickable.php
==============================================================================
*** trunk/tests/text_processing/make_clickable.php (original)
--- trunk/tests/text_processing/make_clickable.php Mon Oct 5 17:15:54 2009
***************
*** 8,15 ****
*
*/
- define('IN_PHPBB', true);
-
require_once 'test_framework/framework.php';
require_once '../phpBB/includes/functions.php';
--- 8,13 ----
***************
*** 66,72 ****
{
foreach ($urls as $url => $url_type)
{
! $input = $prefix . $schema . $url . $suffix;
// no valid url => no change
$output = $input;
--- 64,70 ----
{
foreach ($urls as $url => $url_type)
{
! $input = $prefix . $url . $suffix;
// no valid url => no change
$output = $input;
***************
*** 106,109 ****
}
}
- ?>
\ No newline at end of file
--- 104,106 ----
Modified: trunk/tests/utf/all_tests.php
==============================================================================
*** trunk/tests/utf/all_tests.php (original)
--- trunk/tests/utf/all_tests.php Mon Oct 5 17:15:54 2009
***************
*** 8,15 ****
*
*/
- define('IN_PHPBB', true);
-
if (!defined('PHPUnit_MAIN_METHOD'))
{
define('PHPUnit_MAIN_METHOD', 'phpbb_utf_all_tests::main');
--- 8,13 ----
***************
*** 43,46 ****
{
phpbb_utf_all_tests::main();
}
- ?>
\ No newline at end of file
--- 41,43 ----
Modified: trunk/tests/utf/utf8_clean_string_test.php
==============================================================================
*** trunk/tests/utf/utf8_clean_string_test.php (original)
--- trunk/tests/utf/utf8_clean_string_test.php Mon Oct 5 17:15:54 2009
***************
*** 8,19 ****
*
*/
- define('IN_PHPBB', true);
-
require_once 'test_framework/framework.php';
-
- define(PHPBB_ROOT_PATH, '../phpBB/');
- define(PHP_EXT, 'php');
require_once '../phpBB/includes/utf/utf_tools.php';
class phpbb_utf_utf8_clean_string_test extends phpbb_test_case
--- 8,14 ----
***************
*** 35,38 ****
$this->assertEquals($output, utf8_clean_string($input), $label);
}
}
- ?>
\ No newline at end of file
--- 30,32 ----
Modified: trunk/tests/utf/utf8_wordwrap_test.php
==============================================================================
*** trunk/tests/utf/utf8_wordwrap_test.php (original)
--- trunk/tests/utf/utf8_wordwrap_test.php Mon Oct 5 17:15:54 2009
***************
*** 8,15 ****
*
*/
- define('IN_PHPBB', true);
-
require_once 'test_framework/framework.php';
require_once '../phpBB/includes/utf/utf_tools.php';
--- 8,13 ----
***************
*** 84,87 ****
$this->assertEquals($expected, $phpbb_utf8_wordwrap, 'Checking UTF-8 cutting long words');
}
}
- ?>
\ No newline at end of file
--- 82,84 ----
|
|
From: Meik S. <acy...@ph...> - 2009-10-04 18:15:42
|
Author: acydburn
Date: Sun Oct 4 19:14:59 2009
New Revision: 10211
Log:
Copy 3.0.x branch to trunk
Added:
trunk/phpBB/
- copied from r10210, branches/phpBB-3_0_0/phpBB/
|
|
From: Meik S. <acy...@ph...> - 2009-10-04 18:14:20
|
Author: acydburn
Date: Sun Oct 4 19:13:59 2009
New Revision: 10210
Log:
Move trunk/phpBB to old_trunk/phpBB
Added:
branches/old_trunk/phpBB/
- copied from r10209, trunk/phpBB/
Removed:
trunk/phpBB/
|
|
From: Meik S. <acy...@ph...> - 2009-10-04 18:10:57
|
Author: acydburn
Date: Sun Oct 4 19:10:42 2009
New Revision: 10209
Log:
I want to move trunk/phpBB (sorry ;)), therefore remove phpBB in old_trunk first.
Removed:
branches/old_trunk/phpBB/
|
|
From: Meik S. <acy...@ph...> - 2009-10-04 18:03:35
|
Author: acydburn
Date: Sun Oct 4 19:03:19 2009
New Revision: 10208
Log:
Fix bug #52515 (wrong bbcode uid assigned if error triggered and quote/forward PM) - still not entirely sure if this will break things, but the correct uid should also be assigned if there is an error triggered somewhere, this does not change the content or the actions assigned.
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 Sun Oct 4 19:03:19 2009
***************
*** 811,817 ****
}
// Decode text for message display
! $bbcode_uid = (($action == 'quote' || $action == 'forward') && !$preview && !$refresh && !sizeof($error)) ? $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) ? $bbcode_uid : $message_parser->bbcode_uid;
$message_parser->decode_message($bbcode_uid);
|
|
From: Meik S. <acy...@ph...> - 2009-10-04 14:26:44
|
Author: acydburn
Date: Sun Oct 4 15:26:29 2009
New Revision: 10207
Log:
Update code_sniffer build.xml file to be executable on our system
Modified:
trunk/code_sniffer/phpbb/build.xml
Modified: trunk/code_sniffer/phpbb/build.xml
==============================================================================
*** trunk/code_sniffer/phpbb/build.xml (original)
--- trunk/code_sniffer/phpbb/build.xml Sun Oct 4 15:26:29 2009
***************
*** 1,65 ****
<?xml version="1.0" encoding="UTF-8"?>
! <project name="code_sniffer" basedir="." default="phpunit">
!
! <property name="cvs.module" value="pear/PHP_CodeSniffer" />
! <property name="working.dir" value="${basedir}/_work/code" />
! <property name="test.coverage" value="${basedir}/_work/coverage" />
!
! <target name="phpunit" depends="update,prepare">
! <exec executable="phpunit">
! <arg line="--coverage-html ${test.coverage}
! PHP_CodeSniffer_AllTests
! ${working.dir}/${cvs.module}/tests/AllTests.php" />
! </exec>
! </target>
!
! <target name="prepare">
! <delete dir="${working.dir}/${cvs.module}/CodeSniffer/Standards/phpbb" />
! <mkdir dir="${working.dir}/${cvs.module}/CodeSniffer/Standards/phpbb"/>
!
! <copy todir="${working.dir}/${cvs.module}/CodeSniffer/Standards/phpbb/Sniffs">
! <fileset dir="${basedir}/Sniffs" />
! </copy>
!
! <copy todir="${working.dir}/${cvs.module}/CodeSniffer/Standards/phpbb/Tests">
! <fileset dir="${basedir}/Tests" />
! </copy>
!
! <copy todir="${working.dir}/${cvs.module}/CodeSniffer/Standards/phpbb">
! <fileset file="${basedir}/phpbbCodingStandard.php" />
! </copy>
! </target>
!
! <target name="cleanup">
! <delete dir="${working.dir}" />
! </target>
! <target name="update">
! <exec executable="cvs" dir="${working.dir}/${cvs.module}">
! <arg line="up" />
! </exec>
! </target>
- <target name="checkout" depends="cleanup">
- <cvspass cvsroot=":pserver:cv...@cv...:/repository" password="phpfi" />
- <cvs cvsRoot=":pserver:cv...@cv...:/repository"
- package="${cvs.module}"
- dest="${working.dir}" />
- </target>
-
<!--
! Installs the sniffs on my local development machine
-->
<target name="install">
! <delete dir="/usr/local/pear/PEAR/PHP/CodeSniffer/Standards/phpbb" />
! <mkdir dir="/usr/local/pear/PEAR/PHP/CodeSniffer/Standards/phpbb" />
! <copy todir="/usr/local/pear/PEAR/PHP/CodeSniffer/Standards/phpbb">
! <fileset file="${basedir}/phpbbCodingStandard.php" />
! </copy>
! <copy todir="/usr/local/pear/PEAR/PHP/CodeSniffer/Standards/phpbb/Sniffs">
! <fileset dir="${basedir}/Sniffs" />
</copy>
</target>
</project>
--- 1,23 ----
<?xml version="1.0" encoding="UTF-8"?>
! <project name="code_sniffer" basedir="." default="install">
! <property name="working.dir" value="${basedir}" />
! <property name="target.dir" value="/usr/share/php/PHP/CodeSniffer/Standards" />
<!--
! Install phpbb sniff
-->
<target name="install">
! <delete dir="${target.dir}/phpbb" />
! <mkdir dir="${target.dir}/phpbb"/>
! <copy todir="${target.dir}/phpbb">
! <fileset file="${working.dir}/phpbbCodingStandard.php" />
</copy>
+ <copy todir="${target.dir}/phpbb/Sniffs">
+ <fileset dir="${working.dir}/Sniffs" />
+ </copy>
+
</target>
</project>
|
|
From: Meik S. <acy...@ph...> - 2009-10-04 13:45:16
|
Author: acydburn
Date: Sun Oct 4 14:44:27 2009
New Revision: 10206
Log:
Copy trunk to old_trunk (old phpBB 3.1.x) to make room for the new trunk
Added:
branches/old_trunk/
- copied from r10205, trunk/
|
|
From: Meik S. <acy...@ph...> - 2009-10-04 11:10:31
|
Author: acydburn
Date: Sun Oct 4 12:10:16 2009
New Revision: 10205
Log:
Bug #52415
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 Sun Oct 4 12:10:16 2009
***************
*** 8,14 ****
*
*/
! $updates_to_version = '3.0.6-RC2';
// 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-RC3';
// Enter any version to update from to test updates. The version within the db will not be updated.
$debug_from_version = false;
***************
*** 883,888 ****
--- 883,890 ----
LOG_TABLE => array('log_time'),
),
),
+ // No changes from 3.0.6-RC2 to 3.0.6-RC3
+ '3.0.6-RC2' => array(),
);
}
***************
*** 1513,1518 ****
--- 1515,1533 ----
// No changes from 3.0.6-RC1 to 3.0.6-RC2
case '3.0.6-RC1':
break;
+
+ // Changes from 3.0.6-RC2 to 3.0.6-RC3
+ case '3.0.6-RC2':
+
+ // Update the Custom Profile Fields based on previous settings to the new format
+ $sql = 'UPDATE ' . PROFILE_FIELDS_TABLE . '
+ SET field_show_on_vt = 1
+ WHERE field_hide = 0
+ AND (field_required = 1 OR field_show_on_reg = 1 OR field_show_profile = 1)';
+ _sql($sql, $errored, $error_ary);
+ $no_updates = false;
+
+ break;
}
}
|
Author: acydburn
Date: Sun Oct 4 12:08:12 2009
New Revision: 10204
Log:
Bug #52175
atm the "fix" with the most changes involved. We will inform style authors about these changes. We will not release RC2 to RC3 code changes, but will annnounce the style changes within the RC3 release announcement.
Modified:
branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm.php
branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_viewfolder.php
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/ucp_pm_viewfolder.html
Modified: branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm.php Sun Oct 4 12:08:12 2009
***************
*** 122,127 ****
--- 122,128 ----
// trigger_error('NO_AUTH_SEND_MESSAGE');
$template->assign_vars(array(
'S_NO_AUTH_SEND_MESSAGE' => true,
+ 'S_COMPOSE_PM_VIEW' => true,
));
$tpl_file = 'ucp_pm_viewfolder';
Modified: branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_viewfolder.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_viewfolder.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_viewfolder.php Sun Oct 4 12:08:12 2009
***************
*** 432,438 ****
'TOTAL_MESSAGES' => (($pm_count == 1) ? $user->lang['VIEW_PM_MESSAGE'] : sprintf($user->lang['VIEW_PM_MESSAGES'], $pm_count)),
'POST_IMG' => (!$auth->acl_get('u_sendpm')) ? $user->img('button_topic_locked', 'POST_PM_LOCKED') : $user->img('button_pm_new', 'POST_NEW_PM'),
- 'L_NO_MESSAGES' => (!$auth->acl_get('u_sendpm')) ? $user->lang['NO_AUTH_SEND_MESSAGE'] : $user->lang['NO_MESSAGES'],
'S_NO_AUTH_SEND_MESSAGE' => !$auth->acl_get('u_sendpm'),
--- 432,437 ----
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html Sun Oct 4 12:08:12 2009
***************
*** 82,91 ****
<!-- END messagerow -->
</ul>
- <!-- ELSEIF S_NO_AUTH_SEND_MESSAGE -->
- <p><strong><!-- IF S_USER_NEW -->{L_USER_NEW_PERMISSION_DISALLOWED}<!-- ELSE -->{L_NO_AUTH_SEND_MESSAGE}<!-- ENDIF --></p></strong>
<!-- ELSE -->
! <p><strong>{L_NO_MESSAGES}</strong></p>
<!-- ENDIF -->
<!-- IF FOLDER_CUR_MESSAGES neq 0 -->
--- 82,95 ----
<!-- END messagerow -->
</ul>
<!-- ELSE -->
! <p><strong>
! <!-- IF S_COMPOSE_PM_VIEW and S_NO_AUTH_SEND_MESSAGE -->
! <!-- IF S_USER_NEW -->{L_USER_NEW_PERMISSION_DISALLOWED}<!-- ELSE -->{L_NO_AUTH_SEND_MESSAGE}<!-- ENDIF -->
! <!-- ELSE -->
! {L_NO_MESSAGES}
! <!-- ENDIF -->
! </strong></p>
<!-- ENDIF -->
<!-- IF FOLDER_CUR_MESSAGES neq 0 -->
Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/ucp_pm_viewfolder.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/ucp_pm_viewfolder.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/ucp_pm_viewfolder.html Sun Oct 4 12:08:12 2009
***************
*** 92,98 ****
</tr>
<!-- BEGINELSE -->
<tr>
! <td class="row1" colspan="{$COLSPAN}" height="30" align="center" valign="middle"><span class="gen"><!-- IF S_USER_NEW -->{L_USER_NEW_PERMISSION_DISALLOWED}<!-- ELSE -->{L_NO_MESSAGES}<!-- ENDIF --></span></td>
</tr>
<!-- END messagerow -->
</table>
--- 92,104 ----
</tr>
<!-- BEGINELSE -->
<tr>
! <td class="row1" colspan="{$COLSPAN}" height="30" align="center" valign="middle"><span class="gen">
! <!-- IF S_COMPOSE_PM_VIEW and S_NO_AUTH_SEND_MESSAGE -->
! <!-- IF S_USER_NEW -->{L_USER_NEW_PERMISSION_DISALLOWED}<!-- ELSE -->{L_NO_AUTH_SEND_MESSAGE}<!-- ENDIF -->
! <!-- ELSE -->
! {L_NO_MESSAGES}
! <!-- ENDIF -->
! </span></td>
</tr>
<!-- END messagerow -->
</table>
|
|
From: Meik S. <acy...@ph...> - 2009-10-04 10:36:08
|
Author: acydburn
Date: Sun Oct 4 11:35:20 2009
New Revision: 10203
Log:
it is not a post but a private message
Modified:
branches/phpBB-3_0_0/phpBB/language/en/email/pm_report_deleted.txt
Modified: branches/phpBB-3_0_0/phpBB/language/en/email/pm_report_deleted.txt
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/email/pm_report_deleted.txt (original)
--- branches/phpBB-3_0_0/phpBB/language/en/email/pm_report_deleted.txt Sun Oct 4 11:35:20 2009
***************
*** 2,8 ****
Hello {USERNAME},
! You are receiving this notification because the report you filed regarding the post "{PM_SUBJECT}" at "{SITENAME}" was deleted by a moderator or administrator.
{EMAIL_SIG}
\ No newline at end of file
--- 2,8 ----
Hello {USERNAME},
! You are receiving this notification because the report you filed regarding the private message "{PM_SUBJECT}" at "{SITENAME}" was deleted by a moderator or administrator.
{EMAIL_SIG}
\ No newline at end of file
|
|
From: Andreas F. <ba...@ph...> - 2009-10-03 13:23:56
|
Author: bantu
Date: Sat Oct 3 14:23:10 2009
New Revision: 10202
Log:
Some nitpicks before we include this file in a final release.
Modified:
branches/phpBB-3_0_0/phpBB/feed.php
Modified: branches/phpBB-3_0_0/phpBB/feed.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/feed.php (original)
--- branches/phpBB-3_0_0/phpBB/feed.php Sat Oct 3 14:23:10 2009
***************
*** 249,255 ****
$content = str_replace('./', $board_url . '/', $content);
// Remove "Select all" link and mouse events
! $content = str_replace('<a href="#" onclick="selectCode(this); return false;">' .$user->lang['SELECT_ALL_CODE'] . '</a>', '', $content);
$content = preg_replace('#(onkeypress|onclick)="(.*?)"#si', '', $content);
// Firefox does not support CSS for feeds, though
--- 249,255 ----
$content = str_replace('./', $board_url . '/', $content);
// Remove "Select all" link and mouse events
! $content = str_replace('<a href="#" onclick="selectCode(this); return false;">' . $user->lang['SELECT_ALL_CODE'] . '</a>', '', $content);
$content = preg_replace('#(onkeypress|onclick)="(.*?)"#si', '', $content);
// Firefox does not support CSS for feeds, though
***************
*** 450,456 ****
$this->sql = array();
// Set some values for pagination
! $this->num_items = $config['feed_limit'];
$this->set_keys();
}
--- 450,456 ----
$this->sql = array();
// Set some values for pagination
! $this->num_items = (int) $config['feed_limit'];
$this->set_keys();
}
***************
*** 828,834 ****
$this->set('date', 'forum_last_post_time');
$this->set('options', 'forum_desc_options');
! $this->num_items = $config['feed_overall_forums_limit'];
}
function open()
--- 828,834 ----
$this->set('date', 'forum_last_post_time');
$this->set('options', 'forum_desc_options');
! $this->num_items = (int) $config['feed_overall_forums_limit'];
}
function open()
|
|
From: Meik S. <acy...@ph...> - 2009-10-03 11:43:59
|
Author: acydburn
Date: Sat Oct 3 12:35:39 2009
New Revision: 10201
Log:
revert r10079 (bug #50035) to be able to investigate other options of handling this later.
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_forum.php
branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_topic.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 Oct 3 12:35:39 2009
***************
*** 202,208 ****
<li>[Fix] Make sure only logs for existing users are displayed and user-specific logs removed on user deletion. (Bug #49855)</li>
<li>[Fix] Only show "Add friend" and "Add foe" links if the specific module is enabled. (Bug #50475)</li>
<li>[Fix] Correctly display list items in forum description in prosilver and administration. (Bug #48055 - Patch by leviatan21)</li>
- <li>[Fix] Fix handling of bookmarks and subscriptions on "split topics", "merge topics" and "merge posts". (Bug #50035)</li>
<li>[Fix] Only embed cron.php if there is no cron lock present to reduce overhead. (Bug #45725 - Patch by TerryE)</li>
<li>[Fix] Add header gradient back into subsilver2 but keep site logo easily replaceable with smaller and bigger ones. (Bug #11142 - Patch by dark/Rain and Raimon)</li>
<li>[Fix] Send activation email when activating user from user settings. (Bug #43145)</li>
--- 202,207 ----
Modified: branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_forum.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_forum.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_forum.php Sat Oct 3 12:35:39 2009
***************
*** 416,429 ****
// If the topic no longer exist, we will update the topic watch table.
// To not let it error out on users watching both topics, we just return on an error...
- // Same for Bookmarks
$db->sql_return_on_error(true);
$db->sql_query('UPDATE ' . TOPICS_WATCH_TABLE . ' SET topic_id = ' . (int) $to_topic_id . ' WHERE ' . $db->sql_in_set('topic_id', $topic_ids));
- $db->sql_query('UPDATE ' . BOOKMARKS_TABLE . ' SET topic_id = ' . (int) $to_topic_id . ' WHERE ' . $db->sql_in_set('topic_id', $topic_ids));
$db->sql_return_on_error(false);
$db->sql_query('DELETE FROM ' . TOPICS_WATCH_TABLE . ' WHERE ' . $db->sql_in_set('topic_id', $topic_ids));
- $db->sql_query('DELETE FROM ' . BOOKMARKS_TABLE . ' WHERE ' . $db->sql_in_set('topic_id', $topic_ids));
// Link to the new topic
$return_link .= (($return_link) ? '<br /><br />' : '') . sprintf($user->lang['RETURN_NEW_TOPIC'], '<a href="' . append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $to_forum_id . '&t=' . $to_topic_id) . '">', '</a>');
--- 416,426 ----
Modified: branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_topic.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_topic.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_topic.php Sat Oct 3 12:35:39 2009
***************
*** 504,548 ****
// Update forum statistics
set_config_count('num_topics', 1, true);
- // Add new topic to bookmarks
- $bookmarks = array();
- $sql = 'SELECT user_id
- FROM ' . BOOKMARKS_TABLE . '
- WHERE topic_id = ' . $topic_id;
- $result = $db->sql_query($sql);
- while ($row = $db->sql_fetchrow($result))
- {
- $bookmarks[] = array(
- 'user_id' => (int) $row['user_id'],
- 'topic_id' => $to_topic_id,
- );
- }
- $db->sql_freeresult($result);
- if (sizeof($bookmarks))
- {
- $db->sql_multi_insert(BOOKMARKS_TABLE, $bookmarks);
- }
-
- // Add new topic to watch-list
- $notifications = array();
- $sql = 'SELECT user_id, notify_status
- FROM ' . TOPICS_WATCH_TABLE . '
- WHERE topic_id = ' . $topic_id;
- $result = $db->sql_query($sql);
- while ($row = $db->sql_fetchrow($result))
- {
- $notifications[] = array(
- 'user_id' => (int) $row['user_id'],
- 'topic_id' => $to_topic_id,
- 'notify_status' => (int) $row['notify_status'],
- );
- }
- $db->sql_freeresult($result);
- if (sizeof($notifications))
- {
- $db->sql_multi_insert(TOPICS_WATCH_TABLE, $notifications);
- }
-
// Link back to both topics
$return_link = sprintf($user->lang['RETURN_TOPIC'], '<a href="' . append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $post_info['forum_id'] . '&t=' . $post_info['topic_id']) . '">', '</a>') . '<br /><br />' . sprintf($user->lang['RETURN_NEW_TOPIC'], '<a href="' . append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $to_forum_id . '&t=' . $to_topic_id) . '">', '</a>');
}
--- 504,509 ----
***************
*** 636,700 ****
if ($row)
{
- // Add new topic to bookmarks
- $bookmarks = array();
- $sql = 'SELECT user_id
- FROM ' . BOOKMARKS_TABLE . '
- WHERE topic_id = ' . (int) $topic_id;
- $result = $db->sql_query($sql);
- while ($row = $db->sql_fetchrow($result))
- {
- $bookmarks[] = array(
- 'user_id' => (int) $row['user_id'],
- 'topic_id' => (int) $to_topic_id,
- );
- }
- $db->sql_freeresult($result);
- if (sizeof($bookmarks))
- {
- // To not let it error out on users, who already bookmarked the topic, we just return on an error...
- $db->sql_return_on_error(true);
- $db->sql_multi_insert(BOOKMARKS_TABLE, $bookmarks);
- $db->sql_return_on_error(false);
- }
-
- // Add new topic to notifications
- $notifications = array();
- $sql = 'SELECT user_id, notify_status
- FROM ' . TOPICS_WATCH_TABLE . '
- WHERE topic_id = ' . (int) $topic_id;
- $result = $db->sql_query($sql);
- while ($row = $db->sql_fetchrow($result))
- {
- $notifications[] = array(
- 'user_id' => (int) $row['user_id'],
- 'topic_id' => (int) $to_topic_id,
- 'notify_status' => (int) $row['notify_status'],
- );
- }
- $db->sql_freeresult($result);
- if (sizeof($notifications))
- {
- // To not let it error out on users, who already watch the topic, we just return on an error...
- $db->sql_return_on_error(true);
- $db->sql_multi_insert(TOPICS_WATCH_TABLE, $notifications);
- $db->sql_return_on_error(false);
- }
-
$return_link .= sprintf($user->lang['RETURN_TOPIC'], '<a href="' . append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $row['forum_id'] . '&t=' . $topic_id) . '">', '</a>');
}
else
{
// If the topic no longer exist, we will update the topic watch table.
// To not let it error out on users watching both topics, we just return on an error...
- // Same for bookmarks
$db->sql_return_on_error(true);
$db->sql_query('UPDATE ' . TOPICS_WATCH_TABLE . ' SET topic_id = ' . (int) $to_topic_id . ' WHERE topic_id = ' . (int) $topic_id);
- $db->sql_query('UPDATE ' . BOOKMARKS_TABLE . ' SET topic_id = ' . (int) $to_topic_id . ' WHERE topic_id = ' . (int) $topic_id);
$db->sql_return_on_error(false);
$db->sql_query('DELETE FROM ' . TOPICS_WATCH_TABLE . ' WHERE topic_id = ' . (int) $topic_id);
- $db->sql_query('DELETE FROM ' . BOOKMARKS_TABLE . ' WHERE topic_id = ' . (int) $topic_id);
}
// Link to the new topic
--- 597,613 ----
|
|
From: Meik S. <acy...@ph...> - 2009-09-30 15:07:57
|
Author: acydburn
Date: Wed Sep 30 16:07:40 2009
New Revision: 10200
Log:
Revert revisions r10176 and r9647 - Bug #45975, #51505
Modified:
branches/phpBB-3_0_0/phpBB/adm/index.php
branches/phpBB-3_0_0/phpBB/adm/style/admin.css
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
Modified: branches/phpBB-3_0_0/phpBB/adm/index.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/index.php (original)
--- branches/phpBB-3_0_0/phpBB/adm/index.php Wed Sep 30 16:07:40 2009
***************
*** 246,252 ****
foreach ($input_ary as $value => $title)
{
$selected = ($input_default !== false && $value == $input_default) ? ' checked="checked"' : '';
! $html .= '<label><input type="radio" name="' . $name . '"' . (($id && !$id_assigned) ? ' id="' . $id . '"' : '') . ' value="' . $value . '"' . $selected . (($key) ? ' accesskey="' . $key . '"' : '') . ' class="radio" /> ' . $user->lang[$title] . '</label> ';
$id_assigned = true;
}
--- 246,252 ----
foreach ($input_ary as $value => $title)
{
$selected = ($input_default !== false && $value == $input_default) ? ' checked="checked"' : '';
! $html .= '<label><input type="radio" name="' . $name . '"' . (($id && !$id_assigned) ? ' id="' . $id . '"' : '') . ' value="' . $value . '"' . $selected . (($key) ? ' accesskey="' . $key . '"' : '') . ' class="radio" /> ' . $user->lang[$title] . '</label>';
$id_assigned = true;
}
Modified: branches/phpBB-3_0_0/phpBB/adm/style/admin.css
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/style/admin.css (original)
--- branches/phpBB-3_0_0/phpBB/adm/style/admin.css Wed Sep 30 16:07:40 2009
***************
*** 195,201 ****
width: 76%;
margin: 0 0 0 3%;
min-height: 350px;
- overflow-x: auto;
}
.rtl #main {
--- 195,200 ----
***************
*** 205,211 ****
* html #main {
height: 350px;
- overflow-x: visible;
}
#page-body.simple-page-body {
--- 204,209 ----
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 Sep 30 16:07:40 2009
***************
*** 94,100 ****
<li>[Fix] Show report button in prosilver for guests who are allowed to report posts. (Bug #45695 - Patch by bantu)</li>
<li>[Fix] Correctly show private message history (Bug #46065 - Patch by bantu)</li>
<li>[Fix] Various XHTML mistakes in prosilver, subsilver2 and the ACP. (Bugs #25545 - Patch by bantu, #26315, #38555, #45505 - Patch by Raimon, #45785, #45865, #47085 - Patch by Raimon)</li>
! <li>[Fix] Fix some ACP style issues (Bug #45975 - Patch by leviatan21, Bug #16109 - Patch by prototech)</li>
<li>[Fix] Move post bump information markup to the template. (Bug #34295 - Patch by bantu)</li>
<li>[Fix] Show error in the ACP when template folder is not readable. (Bug #45705 - Patch by bantu)</li>
<li>[Fix] Adjust viewonline filename regular expression to be less strict. (Bug #46215 - Patch by bantu)</li>
--- 94,100 ----
<li>[Fix] Show report button in prosilver for guests who are allowed to report posts. (Bug #45695 - Patch by bantu)</li>
<li>[Fix] Correctly show private message history (Bug #46065 - Patch by bantu)</li>
<li>[Fix] Various XHTML mistakes in prosilver, subsilver2 and the ACP. (Bugs #25545 - Patch by bantu, #26315, #38555, #45505 - Patch by Raimon, #45785, #45865, #47085 - Patch by Raimon)</li>
! <li>[Fix] Fix some ACP style issues (Bug #16109 - Patch by prototech)</li>
<li>[Fix] Move post bump information markup to the template. (Bug #34295 - Patch by bantu)</li>
<li>[Fix] Show error in the ACP when template folder is not readable. (Bug #45705 - Patch by bantu)</li>
<li>[Fix] Adjust viewonline filename regular expression to be less strict. (Bug #46215 - Patch by bantu)</li>
|
|
From: Henry S. <kel...@ph...> - 2009-09-30 15:01:39
|
Author: Kellanved
Date: Wed Sep 30 16:00:44 2009
New Revision: 10199
Log:
#52245
Authorised by: AcydBurn
Modified:
branches/phpBB-3_0_0/phpBB/includes/acp/acp_users.php
Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_users.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_users.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_users.php Wed Sep 30 16:00:44 2009
***************
*** 1023,1029 ****
'U_WHOIS' => $this->u_action . "&action=whois&user_ip={$user_row['user_ip']}",
'U_MCP_QUEUE' => ($auth->acl_getf_global('m_approve')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue', true, $user->session_id) : '',
! 'U_SWITCH_PERMISSIONS' => ($auth->acl_get('a_switchperm') && $user->data['user_id'] != $user_row['user_id']) ? append_sid("{$phpbb_root_path}ucp.$phpEx", "mode=switch_perm&u={$user_row['user_id']}") : '',
'POSTS_IN_QUEUE' => $user_row['posts_in_queue'],
'USER' => $user_row['username'],
--- 1023,1029 ----
'U_WHOIS' => $this->u_action . "&action=whois&user_ip={$user_row['user_ip']}",
'U_MCP_QUEUE' => ($auth->acl_getf_global('m_approve')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue', true, $user->session_id) : '',
! 'U_SWITCH_PERMISSIONS' => ($auth->acl_get('a_switchperm') && $user->data['user_id'] != $user_row['user_id']) ? append_sid("{$phpbb_root_path}ucp.$phpEx", "mode=switch_perm&u={$user_row['user_id']}&hash=" . generate_link_hash('switchperm')) : '',
'POSTS_IN_QUEUE' => $user_row['posts_in_queue'],
'USER' => $user_row['username'],
|
|
From: Meik S. <acy...@ph...> - 2009-09-30 14:52:29
|
Author: acydburn
Date: Wed Sep 30 15:51:43 2009
New Revision: 10198
Log:
Disable copy forum permissions screen in forums creation/update workflow - also fixes Bug #52035
We will revisit this one later
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 Wed Sep 30 15:51:43 2009
***************
*** 193,210 ****
$cache->destroy('sql', FORUMS_TABLE);
// Copy permissions?
! if (!empty($forum_perm_from) && $forum_perm_from != $forum_data['forum_id'] &&
! (($action != 'edit') || empty($forum_id) || ($auth->acl_get('a_fauth') && $auth->acl_get('a_authusers') && $auth->acl_get('a_authgroups') && $auth->acl_get('a_mauth'))))
{
copy_forum_permissions($forum_perm_from, $forum_data['forum_id'], ($action == 'edit') ? true : false);
cache_moderators();
}
! else if (($action != 'edit') && $auth->acl_get('a_fauth') && $auth->acl_get('a_authusers') && $auth->acl_get('a_authgroups') && $auth->acl_get('a_mauth'))
{
$this->copy_permission_page($forum_data);
return;
}
!
$auth->acl_clear_prefetch();
$acl_url = '&mode=setting_forum_local&forum_id[]=' . $forum_data['forum_id'];
--- 193,211 ----
$cache->destroy('sql', FORUMS_TABLE);
// Copy permissions?
! if ($forum_perm_from && $forum_perm_from != $forum_data['forum_id'] &&
! ($action != 'edit' || empty($forum_id) || ($auth->acl_get('a_fauth') && $auth->acl_get('a_authusers') && $auth->acl_get('a_authgroups') && $auth->acl_get('a_mauth'))))
{
copy_forum_permissions($forum_perm_from, $forum_data['forum_id'], ($action == 'edit') ? true : false);
cache_moderators();
}
! /* Commented out because of questionable UI workflow - re-visit for 3.0.7
! else if (!$this->parent_id && $action != 'edit' && $auth->acl_get('a_fauth') && $auth->acl_get('a_authusers') && $auth->acl_get('a_authgroups') && $auth->acl_get('a_mauth'))
{
$this->copy_permission_page($forum_data);
return;
}
! */
$auth->acl_clear_prefetch();
$acl_url = '&mode=setting_forum_local&forum_id[]=' . $forum_data['forum_id'];
***************
*** 1919,1924 ****
--- 1920,1926 ----
/**
* Display copy permission page
+ * Not used at the moment - we will have a look at it for 3.0.7
*/
function copy_permission_page($forum_data)
{
|
7 messages has been excluded from this view by a project administrator.
