diff --git a/phpBB/includes/db/dbal.php b/phpBB/includes/db/dbal.php index 7a7d2e2a00..caa6f70a00 100644 --- a/phpBB/includes/db/dbal.php +++ b/phpBB/includes/db/dbal.php @@ -11,7 +11,6 @@ /** * @package dbal * Database Abstraction Layer -* Minimum Requirement PHP 4.3.3 */ class dbal { diff --git a/phpBB/includes/ucp/ucp_pm_viewfolder.php b/phpBB/includes/ucp/ucp_pm_viewfolder.php index a15acd9c5d..8de14eabde 100644 --- a/phpBB/includes/ucp/ucp_pm_viewfolder.php +++ b/phpBB/includes/ucp/ucp_pm_viewfolder.php @@ -190,9 +190,10 @@ function get_pm_from($folder_id, $folder, $user_id, $url, $type = 'folder') $start = request_var('start', 0); - $sort_days = request_var('st', ((!empty($user->data['user_post_show_days'])) ? $user->data['user_post_show_days'] : 0)); - $sort_key = request_var('sk', ((!empty($user->data['user_post_sortby_type'])) ? $user->data['user_post_sortby_type'] : 't')); - $sort_dir = request_var('sd', ((!empty($user->data['user_post_sortby_dir'])) ? $user->data['user_post_sortby_dir'] : 'd')); + // Additional vars later, pm ordering is mostly different from post ordering. :/ + $sort_days = request_var('st', 0); + $sort_key = request_var('sk', 't'); + $sort_dir = request_var('sd', 'd'); // PM ordering options $limit_days = array(0 => $user->lang['ALL_MESSAGES'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 364 => $user->lang['1_YEAR']); diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql index ccab858787..ac13607e3b 100644 --- a/phpBB/install/schemas/mssql_schema.sql +++ b/phpBB/install/schemas/mssql_schema.sql @@ -297,7 +297,7 @@ CREATE TABLE [phpbb_modules] ( [module_langname] [varchar] (50) NOT NULL , [module_mode] [varchar] (255) NOT NULL , [module_auth] [varchar] (255) NOT NULL -) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] +) ON [PRIMARY] GO CREATE TABLE [phpbb_poll_results] (