fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-06 10:11:38 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'pr/55' into develop

Browse source 
Conflicts:
	modules/communication/communication.controller.php
This commit is contained in:
bnu 2013-11-23 20:18:20 +09:00
commit bf85de4e26
8 changed files with 109 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/spamfilter/spamfilter.model.php
View file

@ -97,7 +97,7 @@ class spamfilterModel extends spamfilter
/**
* @brief Check the specified time
*/
function checkLimited()
function checkLimited($isMessage = FALSE)
{
$config = $this->getConfig();
@ -118,7 +118,14 @@ class spamfilterModel extends spamfilter
// If the number of limited posts is not reached, keep creating.
if($count)
{
$message = sprintf(Context::getLang('msg_alert_limited_by_config'), $interval);
if($isMessage)
{
$message = sprintf(Context::getLang('msg_alert_limited_message_by_config'), $interval);
}
else
{
$message = sprintf(Context::getLang('msg_alert_limited_by_config'), $interval);
}
$oSpamFilterController = &getController('spamfilter');
$oSpamFilterController->insertLog();