merge sandbox to trunk for 1.4.3.1

git-svn-id: http://xe-core.googlecode.com/svn/trunk@7659 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
zero 2010-08-25 06:19:21 +00:00
parent 289973781a
commit 200d63636c
195 changed files with 8166 additions and 3576 deletions

View file

@ -32,9 +32,10 @@
**/
function procSpamfilterAdminInsertDeniedIP() {
$ipaddress = Context::get('ipaddress');
$description = Context::get('description');
$oSpamfilterController = &getController('spamfilter');
return $oSpamfilterController->insertIP($ipaddress);
return $oSpamfilterController->insertIP($ipaddress, $description);
}
/**