1 files changed, 45 insertions, 9 deletions
diff --git a/phpBB/phpbb/log/log.php b/phpBB/phpbb/log/log.php
index 44fba06d9d..e4c5ce47d9 100644
--- a/phpBB/phpbb/log/log.php
+++ b/phpBB/phpbb/log/log.php
@@ -305,9 +305,17 @@ class log implements \phpbb\log\log_interface
 		* @var	array	sql_ary			Array with log data we insert into the
 		*							database. If sql_ary[log_type] is not set,
 		*							we won't add the entry to the database.
-		* @since 3.1-A1
+		* @since 3.1.0-a1
 		*/
-		$vars = array('mode', 'user_id', 'log_ip', 'log_operation', 'log_time', 'additional_data', 'sql_ary');
+		$vars = array(
+			'mode',
+			'user_id',
+			'log_ip',
+			'log_operation',
+			'log_time',
+			'additional_data',
+			'sql_ary',
+		);
 		extract($this->dispatcher->trigger_event('core.add_log', compact($vars)));
 
 		// We didn't find a log_type, so we don't save it in the database.
@@ -403,9 +411,23 @@ class log implements \phpbb\log\log_interface
 		*							is false, no entries will be returned.
 		* @var	string	sql_additional	Additional conditions for the entries,
 		*								e.g.: 'AND l.forum_id = 1'
-		* @since 3.1-A1
+		* @since 3.1.0-a1
 		*/
-		$vars = array('mode', 'count_logs', 'limit', 'offset', 'forum_id', 'topic_id', 'user_id', 'log_time', 'sort_by', 'keywords', 'profile_url', 'log_type', 'sql_additional');
+		$vars = array(
+			'mode',
+			'count_logs',
+			'limit',
+			'offset',
+			'forum_id',
+			'topic_id',
+			'user_id',
+			'log_time',
+			'sort_by',
+			'keywords',
+			'profile_url',
+			'log_type',
+			'sql_additional',
+		);
 		extract($this->dispatcher->trigger_event('core.get_logs_modify_type', compact($vars)));
 
 		if ($log_type === false)
@@ -499,7 +521,7 @@ class log implements \phpbb\log\log_interface
 			* @event core.get_logs_modify_entry_data
 			* @var	array	row			Entry data from the database
 			* @var	array	log_entry_data	Entry's data which is returned
-			* @since 3.1-A1
+			* @since 3.1.0-a1
 			*/
 			$vars = array('row', 'log_entry_data');
 			extract($this->dispatcher->trigger_event('core.get_logs_modify_entry_data', compact($vars)));
@@ -520,7 +542,7 @@ class log implements \phpbb\log\log_interface
 					$num_args = 0;
 					if (!is_array($this->user->lang[$row['log_operation']]))
 					{
-						$num_args = substr_count($log[$i]['action'], '%');
+						$num_args = substr_count($this->user->lang[$row['log_operation']], '%');
 					}
 					else
 					{
@@ -576,7 +598,7 @@ class log implements \phpbb\log\log_interface
 		*									get the permission data
 		* @var	array	reportee_id_list	Array of additional user IDs we
 		*									get the username strings for
-		* @since 3.1-A1
+		* @since 3.1.0-a1
 		*/
 		$vars = array('log', 'topic_id_list', 'reportee_id_list');
 		extract($this->dispatcher->trigger_event('core.get_logs_get_additional_data', compact($vars)));
@@ -643,9 +665,23 @@ class log implements \phpbb\log\log_interface
 			$operations = array();
 			foreach ($this->user->lang as $key => $value)
 			{
-				if (substr($key, 0, 4) == 'LOG_' && preg_match($keywords_pattern, $value))
+				if (substr($key, 0, 4) == 'LOG_')
 				{
-					$operations[] = $key;
+					if (is_array($value))
+					{
+						foreach ($value as $plural_value)
+						{
+							if (preg_match($keywords_pattern, $plural_value))
+							{
+								$operations[] = $key;
+								break;
+							}
+						}
+					}
+					else if (preg_match($keywords_pattern, $value))
+					{
+						$operations[] = $key;
+					}
 				}
 			}