diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-04-11 14:14:23 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-04-11 14:14:23 +0000 |
| commit | c1c3b9f9124b42dd37b5d1da582e23b927cbee44 (patch) | |
| tree | 7ba6bd9dff5e1982e01a9e1e4062c0dd1c5e97b2 | |
| parent | 5a13f125a61601f2e47b32a4d94ef9c1e0b9e3db (diff) | |
| download | forums-c1c3b9f9124b42dd37b5d1da582e23b927cbee44.tar forums-c1c3b9f9124b42dd37b5d1da582e23b927cbee44.tar.gz forums-c1c3b9f9124b42dd37b5d1da582e23b927cbee44.tar.bz2 forums-c1c3b9f9124b42dd37b5d1da582e23b927cbee44.tar.xz forums-c1c3b9f9124b42dd37b5d1da582e23b927cbee44.zip | |
fixing two potential problems
- blank style
- check for correct role assignment within auth.php (should not happen, but seems like some users are not able to persist from manually messing with the db)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8502 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 26 | ||||
| -rw-r--r-- | phpBB/includes/auth.php | 2 | ||||
| -rw-r--r-- | phpBB/style.php | 7 |
3 files changed, 19 insertions, 16 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index dd4fd3b90a..7596bb76c7 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -53,6 +53,7 @@ <ol> <li><a href="#changelog">Changelog</a> <ol style="list-style-type: lower-roman;"> + <li><a href="#v301">Changes since 3.0.1</a></li> <li><a href="#v300">Changes since 3.0.0</a></li> <li><a href="#v30rc8">Changes since RC-8</a></li> <li><a href="#v30rc7">Changes since RC-7</a></li> @@ -81,7 +82,14 @@ <div class="content"> - <a name="v300"></a><h3>1.i. Changes since 3.0.0</h3> + <a name="v301"></a><h3>1.i. Changes since 3.0.1</h3> + + <ul> + <li>[Fix] Ability to set permissions on non-mysql dbms (Bug #24955)</li> + <li>[Fix] Fixed blank style on setups having no username defined within config.php (Bug #25065)</li> + </ul> + + <a name="v300"></a><h3>1.ii. Changes since 3.0.0</h3> <ul> <li>[Change] Validate birthdays (Bug #15004)</li> @@ -152,7 +160,7 @@ <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.i. Changes since 3.0.RC8</h3> + <a name="v30rc8"></a><h3>1.iii. 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> @@ -161,7 +169,7 @@ <li>[Fix] Call garbage_collection() within database updater to correctly close connections (affects Oracle for example)</li> </ul> - <a name="v30rc7"></a><h3>1.ii. Changes since 3.0.RC7</h3> + <a name="v30rc7"></a><h3>1.iv. Changes since 3.0.RC7</h3> <ul> <li>[Fix] Fixed MSSQL related bug in the update system</li> @@ -196,7 +204,7 @@ <li>[Fix] No duplication of active topics (Bug #15474)</li> </ul> - <a name="v30rc6"></a><h3>1.iii. Changes since 3.0.RC6</h3> + <a name="v30rc6"></a><h3>1.v. Changes since 3.0.RC6</h3> <ul> <li>[Fix] Submitting language changes using acp_language (Bug #14736)</li> @@ -206,7 +214,7 @@ <li>[Fix] Able to request new password (Bug #14743)</li> </ul> - <a name="v30rc5"></a><h3>1.iv. Changes since 3.0.RC5</h3> + <a name="v30rc5"></a><h3>1.vi. 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> @@ -269,7 +277,7 @@ <li>[Sec] New password hashing mechanism for storing passwords (#i42)</li> </ul> - <a name="v30rc4"></a><h3>1.v. Changes since 3.0.RC4</h3> + <a name="v30rc4"></a><h3>1.vii. Changes since 3.0.RC4</h3> <ul> <li>[Fix] MySQL, PostgreSQL and SQLite related database fixes (Bug #13862)</li> @@ -320,7 +328,7 @@ <li>[Fix] odbc_autocommit causing existing result sets to be dropped (Bug #14182)</li> </ul> - <a name="v30rc3"></a><h3>1.vi. Changes since 3.0.RC3</h3> + <a name="v30rc3"></a><h3>1.viii. Changes since 3.0.RC3</h3> <ul> <li>[Fix] Fixing some subsilver2 and prosilver style issues</li> @@ -429,7 +437,7 @@ </ul> - <a name="v30rc2"></a><h3>1.vii. Changes since 3.0.RC2</h3> + <a name="v30rc2"></a><h3>1.ix. Changes since 3.0.RC2</h3> <ul> <li>[Fix] Re-allow searching within the memberlist</li> @@ -475,7 +483,7 @@ </ul> - <a name="v30rc1"></a><h3>1.viii. Changes since 3.0.RC1</h3> + <a name="v30rc1"></a><h3>1.x. Changes since 3.0.RC1</h3> <ul> <li>[Fix] (X)HTML issues within the templates (Bug #11255, #11255)</li> diff --git a/phpBB/includes/auth.php b/phpBB/includes/auth.php index 8dd15fea64..d0b38b67a3 100644 --- a/phpBB/includes/auth.php +++ b/phpBB/includes/auth.php @@ -800,7 +800,7 @@ class auth { $this->_set_group_hold_ary($hold_ary[$row['forum_id']], $row['auth_option_id'], $row['auth_setting']); } - else + else if (!empty($this->role_cache[$row['auth_role_id']])) { foreach (unserialize($this->role_cache[$row['auth_role_id']]) as $option_id => $setting) { diff --git a/phpBB/style.php b/phpBB/style.php index 9d38128356..599434d087 100644 --- a/phpBB/style.php +++ b/phpBB/style.php @@ -20,7 +20,7 @@ error_reporting(E_ALL ^ E_NOTICE); require($phpbb_root_path . 'config.' . $phpEx); -if (!defined('PHPBB_INSTALLED') || empty($dbms) || !isset($dbhost) || !isset($dbpasswd) || empty($dbuser)) +if (!defined('PHPBB_INSTALLED') || empty($dbms) || empty($acm_type)) { exit; } @@ -57,11 +57,6 @@ if (strspn($sid, 'abcdefABCDEF0123456789') !== strlen($sid)) // server a little if ($id) { - if (empty($acm_type) || empty($dbms)) - { - die('Hacking attempt'); - } - // Include files require($phpbb_root_path . 'includes/acm/acm_' . $acm_type . '.' . $phpEx); require($phpbb_root_path . 'includes/cache.' . $phpEx); |