fixes #821, refs #819

4 files changed, 35 insertions, 5 deletions

diff --git a/core/Log/APICall.php b/core/Log/APICall.php
index 0f11c719c9..3e8a1198ac 100644
--- a/core/Log/APICall.php
+++ b/core/Log/APICall.php
@@ -36,9 +36,19 @@ class Piwik_Log_APICall extends Piwik_Log
 		
 		$this->setEventItem('caller_ip', Piwik_Common::getIp() );
 	}
-	
-	function log( $className, $methodName, $parameterNames,	$parameterValues, $executionTime, $returnedValue)
+
+	function log($className, $methodName)
 	{
+		// sanity checks
+		if(func_num_args() != 6) {
+			return;
+		}
+
+		$parameterNames = func_get_arg(2);
+		$parameterValues = func_get_arg(3);
+		$executionTime = func_get_arg(4);
+		$returnedValue = func_get_arg(5);
+
 		$event = array();
 		$event['class_name'] = $className;
 		$event['method_name'] = $methodName;
diff --git a/core/Log/Error.php b/core/Log/Error.php
index c5db22cbbc..83c5c0c5fe 100644
--- a/core/Log/Error.php
+++ b/core/Log/Error.php
@@ -42,8 +42,17 @@ class Piwik_Log_Error extends Piwik_Log
 		$this->addWriter($writerScreen);
 	}
 	
-	public function log($errno, $errstr, $errfile, $errline, $backtrace)
+	public function log($errno, $errstr)
 	{
+		// sanity checks
+		if(func_num_args() != 5) {
+			return;
+		}
+
+		$errfile = func_get_arg(2);
+		$errline = func_get_arg(3);
+		$backtrace = func_get_arg(4);
+
 		$event = array();
 		$event['errno'] = $errno;
 		$event['message'] = $errstr;
diff --git a/core/Log/Exception.php b/core/Log/Exception.php
index 4e678cc211..c9252b7d5c 100644
--- a/core/Log/Exception.php
+++ b/core/Log/Exception.php
@@ -44,14 +44,20 @@ class Piwik_Log_Exception extends Piwik_Log
 		$this->addWriter($writerScreen);
 	}
 
-	public function log($exception)
+	public function log($exception, $unused = null)
 	{
+		// sanity checks
+		if(func_num_args() != 1) {
+			return;
+		}
+
 		$event = array();
 		$event['errno'] 	= $exception->getCode();
 		$event['message'] 	= $exception->getMessage();
 		$event['errfile'] 	= $exception->getFile();
 		$event['errline'] 	= $exception->getLine();
 		$event['backtrace'] = $exception->getTraceAsString();
+
 		parent::log($event);
 	}
 }
diff --git a/core/Log/Message.php b/core/Log/Message.php
index 648d1dc57c..84a80e2044 100644
--- a/core/Log/Message.php
+++ b/core/Log/Message.php
@@ -34,8 +34,13 @@ class Piwik_Log_Message extends Piwik_Log
 							$logToDatabaseColumnMapping );
 	}
 	
-	public function log( $message )
+	public function log($message, $unused = null)
 	{
+		// sanity checks
+		if(func_num_args() != 1) {
+			return;
+		}
+
 		$event = array();
 		$event['message'] = $message;
 		parent::log($event);