diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-05-05 18:09:58 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-05-05 18:09:58 +0000 |
| commit | fb5f24578b46d8f7698ea4c4b3d764c4b0a1aa64 (patch) | |
| tree | d2d0c783db3a6c1a8a1cc8880dabfd0acc56f0da | |
| parent | 95c564636ff34cc30a48475f9ca0e23a8106fc5a (diff) | |
| download | forums-fb5f24578b46d8f7698ea4c4b3d764c4b0a1aa64.tar forums-fb5f24578b46d8f7698ea4c4b3d764c4b0a1aa64.tar.gz forums-fb5f24578b46d8f7698ea4c4b3d764c4b0a1aa64.tar.bz2 forums-fb5f24578b46d8f7698ea4c4b3d764c4b0a1aa64.tar.xz forums-fb5f24578b46d8f7698ea4c4b3d764c4b0a1aa64.zip | |
bugfixes. :/ An ugly one included as a temporary solution...
git-svn-id: file:///svn/phpbb/trunk@7476 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/adm/style/acp_ban.html | 4 | ||||
| -rw-r--r-- | phpBB/includes/message_parser.php | 17 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_viewfolder.php | 5 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/memberlist_im.html | 3 |
4 files changed, 21 insertions, 8 deletions
diff --git a/phpBB/adm/style/acp_ban.html b/phpBB/adm/style/acp_ban.html index 24abf3e889..5bc029f75c 100644 --- a/phpBB/adm/style/acp_ban.html +++ b/phpBB/adm/style/acp_ban.html @@ -50,8 +50,8 @@ </dl> <dl> <dt><label for="banlength">{L_BAN_LENGTH}:</label></dt> - <dd><select name="banlength" id="banlength">{S_BAN_END_OPTIONS}</select></dd> - <dd><input type="text" class="text" name="banlengthother" maxlength="10" /> {L_YEAR_MONTH_DAY}</dd> + <dd><label for="banlength"><select name="banlength" id="banlength" onchange="if(this.value==-1){document.getElementById('banlengthother').style.display = 'block';}else{document.getElementById('banlengthother').style.display='none';}">{S_BAN_END_OPTIONS}</select></label></dd> + <dd id="banlengthother" style="display: none;"><label><input type="text" name="banlengthother" class="inputbox" /><br /><span>{L_YEAR_MONTH_DAY}</span></label></dd> </dl> <dl> <dt><label for="banexclude">{L_BAN_EXCLUDE}:</label><br /><span>{L_BAN_EXCLUDE_EXPLAIN}</span></dt> diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index b55a5fa069..acb9f50ce6 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -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 . ']', '"&quot;:' . $this->bbcode_uid . ']', $this->message); + $replaced = true; + } + $this->magic_url(generate_board_url()); - + + // Revert our change above + if ($replaced) + { + $this->message = str_replace('"&quot;:' . $this->bbcode_uid . ']', '":' . $this->bbcode_uid . ']', $this->message); + } + if ($config['max_' . $mode . '_urls']) { $num_urls += preg_match_all('#\<!-- ([lmwe]) --\>.*?\<!-- \1 --\>#', $this->message, $matches); diff --git a/phpBB/includes/ucp/ucp_pm_viewfolder.php b/phpBB/includes/ucp/ucp_pm_viewfolder.php index e5fa2903fd..3c11a3ae8a 100644 --- a/phpBB/includes/ucp/ucp_pm_viewfolder.php +++ b/phpBB/includes/ucp/ucp_pm_viewfolder.php @@ -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 = ''; diff --git a/phpBB/styles/subsilver2/template/memberlist_im.html b/phpBB/styles/subsilver2/template/memberlist_im.html index a4486ada21..285190c3d5 100644 --- a/phpBB/styles/subsilver2/template/memberlist_im.html +++ b/phpBB/styles/subsilver2/template/memberlist_im.html @@ -120,9 +120,6 @@ <tr> <td class="row1" colspan="2"><span class="genmed">{L_IM_NO_JABBER}</span></td> </tr> - <tr> - <td class="cat" colspan="2" align="center"><input class="btnmain" name="submit" type="submit" value="{L_IM_SEND}" /></td> - </tr> <!-- ENDIF --> <!-- IF S_SENT_JABBER --> |