fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-05 17:51:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of https://github.com/rhymix/rhymix into pr/communication

Browse source 
# Conflicts:
#	modules/communication/communication.controller.php
This commit is contained in:
conory 2016-03-06 17:23:19 +09:00
commit 65dc36f661
189 changed files with 842 additions and 1120 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/communication/communication.controller.php
View file

@ -837,7 +837,7 @@ class communicationController extends communication
$new_message_count = (int) trim(FileHandler::readFile($flag_file));
if($new_message_count > 0)
{
$text = preg_replace('@\r?\n@', '\\n', addslashes(Context::getLang('alert_new_message_arrived')));
$text = preg_replace('@\r?\n@', '\\n', addslashes(lang('alert_new_message_arrived')));
Context::addHtmlFooter("<script>jQuery(function(){ xeNotifyMessage('{$text}','{$new_message_count}'); });</script>");
Context::loadFile(array('./modules/communication/tpl/js/member_communication.js'), true);
}