Julian/phpbb_mchat_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into js-cleanup

Browse Source
This commit is contained in:
kasimi
2015-12-14 13:20:23 +01:00
parent 5616b3b6e7 e06fcf281e
commit 1754bb729f
4 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
adm/style/acp_mchat.html
View File

@@ -51,8 +51,8 @@
<dl>
<dt><label for="mchat_message_top">{L_MCHAT_MESSAGE_TOP}{L_COLON}</label><br />
<span>{L_MCHAT_MESSAGE_TOP_EXPLAIN}</span></dt>
<dd><label><input type="radio" class="radio" name="mchat_message_top" value="1"<!-- IF MCHAT_MESSAGE_TOP --> id="mchat_message_top" checked="checked"<!-- ENDIF --> /> {L_MCHAT_BOTTOM}</label>
<label><input type="radio" class="radio" name="mchat_message_top" value="0"<!-- IF not MCHAT_MESSAGE_TOP --> id="mchat_message_top" checked="checked"<!-- ENDIF --> /> {L_MCHAT_TOP}</label></dd>
<dd><label><input type="radio" class="radio" name="mchat_message_top" value="1"<!-- IF MCHAT_MESSAGE_TOP --> id="mchat_message_top" checked="checked"<!-- ENDIF --> /> {L_MCHAT_TOP}</label>
<label><input type="radio" class="radio" name="mchat_message_top" value="0"<!-- IF not MCHAT_MESSAGE_TOP --> id="mchat_message_top" checked="checked"<!-- ENDIF --> /> {L_MCHAT_BOTTOM}</label></dd>
</dl>
<dl>
<dt><label for="mchat_new_posts">{L_MCHAT_NEW_POSTS}{L_COLON}</label><br />

4
core/render_helper.php
View File

@@ -427,7 +427,7 @@ class render_helper
$rows = $this->db->sql_fetchrowset($result);
$this->db->sql_freeresult($result);
// Reverse the array wanting messages appear in reverse
if($this->config['mchat_message_top'])
if(!$this->config['mchat_message_top'])
{
$rows = array_reverse($rows);
}
@@ -984,7 +984,7 @@ class render_helper
$rows = $this->db->sql_fetchrowset($result);
$this->db->sql_freeresult($result);
if($this->config['mchat_message_top'])
if(!$this->config['mchat_message_top'])
{
$rows = array_reverse($rows, true);
}

2
styles/prosilver/template/jquery-1.8.3.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
styles/prosilver/template/mchat_body.html
View File

@@ -5,11 +5,9 @@
<!-- INCLUDEJS editor.js -->
<!-- INCLUDEJS jquery.titlealert.min.js -->
<!-- INCLUDEJS jquery_cookie_mini.js -->
<!-- INCLUDEJS jquery-1.8.3.min.js -->
<!-- INCLUDEJS jquery.maxlength.min.js -->
<!-- INCLUDEJS mchat.min.js -->
<!-- IF MCHAT_ARCHIVE_MODE -->
<!--**
*