mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-10 10:44:20 +02:00
Code Issues Releases Wiki Activity

bugfixes. :/ An ugly one included as a temporary solution...

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@7476 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2007-05-05 18:09:58 +00:00
parent 95c564636f
commit fb5f24578b
4 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
phpBB/includes/message_parser.php
View File

@@ -1031,8 +1031,23 @@ class parse_message extends bbcode_firstpass
// Parse URL's
if ($allow_magic_url)
{
$replaced = false;
// We have the bbcode uid here, let's at least try to circumvent a specific bug...
if ($allow_bbcode && strpos($this->message, '[/quote:' . $this->bbcode_uid . ']') !== false && strpos($this->message, '":' . $this->bbcode_uid . ']') !== false)
{
$this->message = str_replace('":' . $this->bbcode_uid . ']', '"":' . $this->bbcode_uid . ']', $this->message);
$replaced = true;
}
$this->magic_url(generate_board_url());
// Revert our change above
if ($replaced)
{
$this->message = str_replace('"":' . $this->bbcode_uid . ']', '":' . $this->bbcode_uid . ']', $this->message);
}
if ($config['max_' . $mode . '_urls'])
{
$num_urls += preg_match_all('#\<!-- ([lmwe]) --\>.*?\<!-- \1 --\>#', $this->message, $matches);

5
phpBB/includes/ucp/ucp_pm_viewfolder.php
View File

@@ -444,15 +444,16 @@ function get_pm_from($folder_id, $folder, $user_id)
$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'], 365 => $user->lang['1_YEAR']);
// No sort by Author for sentbox/outbox (already only author available)
// Also, sort by msg_id for the time - private messages are not as prone to errors as posts are.
if ($folder_id == PRIVMSGS_OUTBOX || $folder_id == PRIVMSGS_SENTBOX)
{
$sort_by_text = array('t' => $user->lang['POST_TIME'], 's' => $user->lang['SUBJECT']);
$sort_by_sql = array('t' => 'p.message_time', 's' => 'p.message_subject');
$sort_by_sql = array('t' => 'p.msg_id', 's' => 'p.message_subject');
}
else
{
$sort_by_text = array('a' => $user->lang['AUTHOR'], 't' => $user->lang['POST_TIME'], 's' => $user->lang['SUBJECT']);
$sort_by_sql = array('a' => 'u.username_clean', 't' => 'p.message_time', 's' => 'p.message_subject');
$sort_by_sql = array('a' => 'u.username_clean', 't' => 'p.msg_id', 's' => 'p.message_subject');
}
$s_limit_days = $s_sort_key = $s_sort_dir = $u_sort_param = '';