aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2005-10-08 10:56:56 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2005-10-08 10:56:56 +0000
commitadcf8be902a1dc2efe49fe309e3412c7ba38f1e2 (patch)
tree49d68ef7c64e5848cef3e097cfe1df5bb4d1aaa3 /phpBB/includes
parent913c38768a21901187d2ded9427b3e2e533206f4 (diff)
downloadforums-adcf8be902a1dc2efe49fe309e3412c7ba38f1e2.tar
forums-adcf8be902a1dc2efe49fe309e3412c7ba38f1e2.tar.gz
forums-adcf8be902a1dc2efe49fe309e3412c7ba38f1e2.tar.bz2
forums-adcf8be902a1dc2efe49fe309e3412c7ba38f1e2.tar.xz
forums-adcf8be902a1dc2efe49fe309e3412c7ba38f1e2.zip
- only minor changes
git-svn-id: file:///svn/phpbb/trunk@5264 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/db/dbal.php1
-rw-r--r--phpBB/includes/ucp/ucp_pm_viewfolder.php7
2 files changed, 4 insertions, 4 deletions
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']);