mirror of
https://github.com/phpbb/phpbb.git
synced 2025-05-06 23:55:26 +02:00
my changes so far...
git-svn-id: file:///svn/phpbb/trunk@7987 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
618e78e41e
commit
33f5e4283b
@ -191,6 +191,7 @@ p a {
|
||||
<ul class="menu">
|
||||
<li>[Fix] MySQL, PostgreSQL and SQLite related database fixes (Bug #13862)</li>
|
||||
<li>[Fix] Allow MS SQL to properly connect when using the mssql driver and PHP is less than either 4.4.1 or 5.1 (Bug #13874)</li>
|
||||
<li>[Fix] Multiple PM recipients not separated (Bug #13876)</li>
|
||||
|
||||
</ul>
|
||||
|
||||
|
@ -974,9 +974,11 @@ if ($exit)
|
||||
exit;
|
||||
}
|
||||
|
||||
_write_result(false, $errored, $error_ary);
|
||||
|
||||
// Schema updates
|
||||
?>
|
||||
</p><br /><br />
|
||||
<br /><br />
|
||||
|
||||
<h1><?php echo $lang['UPDATE_DATABASE_SCHEMA']; ?></h1>
|
||||
|
||||
|
@ -31,8 +31,8 @@
|
||||
<p class="author">
|
||||
<strong>{L_SENT_AT}:</strong> {SENT_DATE}
|
||||
<br /><strong>{L_PM_FROM}:</strong> {MESSAGE_AUTHOR_FULL}
|
||||
<!-- IF S_TO_RECIPIENT --><br /><strong>{L_TO}:</strong> <!-- BEGIN to_recipient --><!-- IF to_recipient.NAME_FULL -->{to_recipient.NAME_FULL}<!-- ELSE --><a href="{to_recipient.U_VIEW}" style="color:<!-- IF to_recipient.COLOUR -->{to_recipient.COLOUR}<!-- ELSEIF to_recipient.IS_GROUP -->#0000FF<!-- ENDIF -->;">{to_recipient.NAME}</a><!-- ENDIF --> <!-- END to_recipient --><!-- ENDIF -->
|
||||
<!-- IF S_BCC_RECIPIENT --><br /><strong>{L_BCC}:</strong> <!-- BEGIN bcc_recipient --><!-- IF bcc_recipient.NAME_FULL -->{bcc_recipient.NAME_FULL}<!-- ELSE --><a href="{bcc_recipient.U_VIEW}" style="color:<!-- IF bcc_recipient.COLOUR -->{bcc_recipient.COLOUR}<!-- ELSEIF bcc_recipient.IS_GROUP -->#0000FF<!-- ENDIF -->;">{bcc_recipient.NAME}</a><!-- ENDIF --> <!-- END bcc_recipient --><!-- ENDIF -->
|
||||
<!-- IF S_TO_RECIPIENT --><br /><strong>{L_TO}:</strong> <!-- BEGIN to_recipient --><!-- IF to_recipient.NAME_FULL -->{to_recipient.NAME_FULL}<!-- ELSE --><a href="{to_recipient.U_VIEW}" style="color:<!-- IF to_recipient.COLOUR -->{to_recipient.COLOUR}<!-- ELSEIF to_recipient.IS_GROUP -->#0000FF<!-- ENDIF -->;">{to_recipient.NAME}</a><!-- ENDIF --> <!-- END to_recipient --><!-- ENDIF -->
|
||||
<!-- IF S_BCC_RECIPIENT --><br /><strong>{L_BCC}:</strong> <!-- BEGIN bcc_recipient --><!-- IF bcc_recipient.NAME_FULL -->{bcc_recipient.NAME_FULL}<!-- ELSE --><a href="{bcc_recipient.U_VIEW}" style="color:<!-- IF bcc_recipient.COLOUR -->{bcc_recipient.COLOUR}<!-- ELSEIF bcc_recipient.IS_GROUP -->#0000FF<!-- ENDIF -->;">{bcc_recipient.NAME}</a><!-- ENDIF --> <!-- END bcc_recipient --><!-- ENDIF -->
|
||||
</p>
|
||||
|
||||
|
||||
|
@ -40,7 +40,7 @@ if (!$auth->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel'))
|
||||
login_box('', $user->lang['LOGIN_EXPLAIN_VIEWONLINE']);
|
||||
}
|
||||
|
||||
$sort_key_text = array('a' => $user->lang['SORT_USERNAME'], 'b' => $user->lang['SORT_LOCATION'], 'c' => $user->lang['SORT_JOINED']);
|
||||
$sort_key_text = array('a' => $user->lang['SORT_USERNAME'], 'b' => $user->lang['SORT_JOINED'], 'c' => $user->lang['SORT_LOCATION']);
|
||||
$sort_key_sql = array('a' => 'u.username_clean', 'b' => 's.session_time', 'c' => 's.session_page');
|
||||
|
||||
// Sorting and order
|
||||
@ -92,6 +92,7 @@ $sql = 'SELECT forum_id, forum_name, parent_id, forum_type, left_id, right_id
|
||||
ORDER BY left_id ASC';
|
||||
$result = $db->sql_query($sql, 600);
|
||||
|
||||
$forum_data = array();
|
||||
while ($row = $db->sql_fetchrow($result))
|
||||
{
|
||||
$forum_data[$row['forum_id']] = $row;
|
||||
|
Loading…
x
Reference in New Issue
Block a user