aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-01-18 10:00:39 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-01-18 10:00:39 +0000
commite6f685c25f4f0414972498a2d3389ada3ea44bbc (patch)
tree154c465eff37883bca0f134cd31ba697c5e95319
parenta64caea9b627cb6fd4b5f9123d3479c08b4328c4 (diff)
downloadforums-e6f685c25f4f0414972498a2d3389ada3ea44bbc.tar
forums-e6f685c25f4f0414972498a2d3389ada3ea44bbc.tar.gz
forums-e6f685c25f4f0414972498a2d3389ada3ea44bbc.tar.bz2
forums-e6f685c25f4f0414972498a2d3389ada3ea44bbc.tar.xz
forums-e6f685c25f4f0414972498a2d3389ada3ea44bbc.zip
fixing some bugs i introduced while fixing other bugs. :)
git-svn-id: file:///svn/phpbb/trunk@6899 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat
-rw-r--r--phpBB/develop/create_schema_files.php4
-rw-r--r--phpBB/includes/acp/acp_permission_roles.php4
-rw-r--r--phpBB/install/database_update.php4
-rw-r--r--phpBB/install/schemas/mysql_40_schema.sql4
-rw-r--r--phpBB/install/schemas/mysql_41_schema.sql4
-rw-r--r--phpBB/install/schemas/oracle_schema.sql4
-rw-r--r--phpBB/install/schemas/postgres_schema.sql4
-rw-r--r--phpBB/install/schemas/sqlite_schema.sql4
-rw-r--r--phpBB/viewforum.php2
9 files changed, 18 insertions, 16 deletions
diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index 8bce25febb..0f9c36bb09 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -1327,7 +1327,7 @@ function get_schema_struct()
'rule_user_id' => array('UINT', 0),
'rule_group_id' => array('UINT', 0),
'rule_action' => array('UINT', 0),
- 'rule_folder_id' => array('UINT', 0),
+ 'rule_folder_id' => array('INT:11', 0),
),
'PRIMARY_KEY' => 'rule_id',
'KEYS' => array(
@@ -1346,7 +1346,7 @@ function get_schema_struct()
'pm_replied' => array('BOOL', 0),
'pm_marked' => array('BOOL', 0),
'pm_forwarded' => array('BOOL', 0),
- 'folder_id' => array('UINT', 0),
+ 'folder_id' => array('INT:11', 0),
),
'KEYS' => array(
'msg_id' => array('INDEX', 'msg_id'),
diff --git a/phpBB/includes/acp/acp_permission_roles.php b/phpBB/includes/acp/acp_permission_roles.php
index 86ac6f60c5..175b4f00d8 100644
--- a/phpBB/includes/acp/acp_permission_roles.php
+++ b/phpBB/includes/acp/acp_permission_roles.php
@@ -330,9 +330,11 @@ class acp_permission_roles
if (sizeof($hold_ary))
{
+ $role_name = (!empty($user->lang[$role_row['role_name']])) ? $user->lang[$role_row['role_name']] : $role_row['role_name']
+
$template->assign_var(array(
'S_DISPLAY_ROLE_MASK' => true,
- 'L_ROLE_ASSIGNED_TO' => sprintf($user->lang['ROLE_ASSIGNED_TO'], $role_row['role_name']))
+ 'L_ROLE_ASSIGNED_TO' => sprintf($user->lang['ROLE_ASSIGNED_TO'], $role_name))
);
$auth_admin->display_role_mask($hold_ary);
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 64a4c46bb8..5b909a1fe6 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -330,10 +330,10 @@ $database_update_info = array(
'prune_freq' => array('UINT', 0),
),
PRIVMSGS_RULES_TABLE => array(
- 'rule_folder_id' => array('UINT', 0),
+ 'rule_folder_id' => array('INT:11', 0),
),
PRIVMSGS_TO_TABLE => array(
- 'folder_id' => array('UINT', 0),
+ 'folder_id' => array('INT:11', 0),
),
),
// Remove the following keys
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index 61ec3e2c9e..2b3022a875 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -511,7 +511,7 @@ CREATE TABLE phpbb_privmsgs_rules (
rule_user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
rule_group_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
rule_action mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
- rule_folder_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
+ rule_folder_id int(11) DEFAULT '0' NOT NULL,
PRIMARY KEY (rule_id),
KEY user_id (user_id)
);
@@ -528,7 +528,7 @@ CREATE TABLE phpbb_privmsgs_to (
pm_replied tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
pm_marked tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
pm_forwarded tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
- folder_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
+ folder_id int(11) DEFAULT '0' NOT NULL,
KEY msg_id (msg_id),
KEY author_id (author_id),
KEY usr_flder_id (user_id, folder_id)
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index 1f1396e9e8..7ade8bd1a4 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -511,7 +511,7 @@ CREATE TABLE phpbb_privmsgs_rules (
rule_user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
rule_group_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
rule_action mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
- rule_folder_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
+ rule_folder_id int(11) DEFAULT '0' NOT NULL,
PRIMARY KEY (rule_id),
KEY user_id (user_id)
) CHARACTER SET `utf8` COLLATE `utf8_bin`;
@@ -528,7 +528,7 @@ CREATE TABLE phpbb_privmsgs_to (
pm_replied tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
pm_marked tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
pm_forwarded tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
- folder_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
+ folder_id int(11) DEFAULT '0' NOT NULL,
KEY msg_id (msg_id),
KEY author_id (author_id),
KEY usr_flder_id (user_id, folder_id)
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index f926ff478b..8634dcd1fe 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -989,7 +989,7 @@ CREATE TABLE phpbb_privmsgs_rules (
rule_user_id number(8) DEFAULT '0' NOT NULL,
rule_group_id number(8) DEFAULT '0' NOT NULL,
rule_action number(8) DEFAULT '0' NOT NULL,
- rule_folder_id number(8) DEFAULT '0' NOT NULL,
+ rule_folder_id number(11) DEFAULT '0' NOT NULL,
CONSTRAINT pk_phpbb_privmsgs_rules PRIMARY KEY (rule_id)
)
/
@@ -1026,7 +1026,7 @@ CREATE TABLE phpbb_privmsgs_to (
pm_replied number(1) DEFAULT '0' NOT NULL,
pm_marked number(1) DEFAULT '0' NOT NULL,
pm_forwarded number(1) DEFAULT '0' NOT NULL,
- folder_id number(8) DEFAULT '0' NOT NULL
+ folder_id number(11) DEFAULT '0' NOT NULL
)
/
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index aa3eb59c46..d0005a16a7 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -691,7 +691,7 @@ CREATE TABLE phpbb_privmsgs_rules (
rule_user_id INT4 DEFAULT '0' NOT NULL CHECK (rule_user_id >= 0),
rule_group_id INT4 DEFAULT '0' NOT NULL CHECK (rule_group_id >= 0),
rule_action INT4 DEFAULT '0' NOT NULL CHECK (rule_action >= 0),
- rule_folder_id INT4 DEFAULT '0' NOT NULL CHECK (rule_folder_id >= 0),
+ rule_folder_id INT4 DEFAULT '0' NOT NULL,
PRIMARY KEY (rule_id)
);
@@ -710,7 +710,7 @@ CREATE TABLE phpbb_privmsgs_to (
pm_replied INT2 DEFAULT '0' NOT NULL CHECK (pm_replied >= 0),
pm_marked INT2 DEFAULT '0' NOT NULL CHECK (pm_marked >= 0),
pm_forwarded INT2 DEFAULT '0' NOT NULL CHECK (pm_forwarded >= 0),
- folder_id INT4 DEFAULT '0' NOT NULL CHECK (folder_id >= 0)
+ folder_id INT4 DEFAULT '0' NOT NULL
);
CREATE INDEX phpbb_privmsgs_to_msg_id ON phpbb_privmsgs_to (msg_id);
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index ccc531a989..93e916a234 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -495,7 +495,7 @@ CREATE TABLE phpbb_privmsgs_rules (
rule_user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
rule_group_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
rule_action INTEGER UNSIGNED NOT NULL DEFAULT '0',
- rule_folder_id INTEGER UNSIGNED NOT NULL DEFAULT '0'
+ rule_folder_id int(11) NOT NULL DEFAULT '0'
);
CREATE INDEX phpbb_privmsgs_rules_user_id ON phpbb_privmsgs_rules (user_id);
@@ -511,7 +511,7 @@ CREATE TABLE phpbb_privmsgs_to (
pm_replied INTEGER UNSIGNED NOT NULL DEFAULT '0',
pm_marked INTEGER UNSIGNED NOT NULL DEFAULT '0',
pm_forwarded INTEGER UNSIGNED NOT NULL DEFAULT '0',
- folder_id INTEGER UNSIGNED NOT NULL DEFAULT '0'
+ folder_id int(11) NOT NULL DEFAULT '0'
);
CREATE INDEX phpbb_privmsgs_to_msg_id ON phpbb_privmsgs_to (msg_id);
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index 4dc7768b30..f7c2d1bbdc 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -156,7 +156,7 @@ if (!$auth->acl_get('f_read', $forum_id))
'S_NO_READ_ACCESS' => true,
'S_AUTOLOGIN_ENABLED' => ($config['allow_autologin']) ? true : false,
- 'S_LOGIN_ACTION' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login') . '&amp;redirect=' . urlencode(build_url(array('_f_'))),
+ 'S_LOGIN_ACTION' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login') . '&amp;redirect=' . urlencode(str_replace('&amp;', '&', build_url(array('_f_')))),
));
page_footer();
generated by cgit v1.2.1 (git 2.21.0) at 2025-05-21 04:02:29 +0000