7 files changed, 30 insertions, 29 deletions
diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php
index 7d564742af..30b364821d 100644
--- a/phpBB/phpbb/session.php
+++ b/phpBB/phpbb/session.php
@@ -441,8 +441,8 @@ class session
 
 					if (!$session_expired)
 					{
-						// Only update session DB a minute or so after last update or if page changes
-						if ($this->time_now - $this->data['session_time'] > 60 || ($this->update_session_page && $this->data['session_page'] != $this->page['page']))
+						// Only update session DB a minute or so after last update or if page changes and is not ajax request
+						if (($this->time_now - $this->data['session_time'] > 60 || ($this->update_session_page && $this->data['session_page'] != $this->page['page'])) && !$request->is_ajax())
 						{
 							$sql_ary = array('session_time' => $this->time_now);
 
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 076a3160f0..1ea5b0973c 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -3,8 +3,6 @@
 <head>
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width" />
-<meta name="keywords" content="" />
-<meta name="description" content="" />
 {META}
 <title><!-- IF UNREAD_NOTIFICATIONS_COUNT -->({UNREAD_NOTIFICATIONS_COUNT}) <!-- ENDIF --><!-- IF not S_VIEWTOPIC and not S_VIEWFORUM -->{SITENAME} - <!-- ENDIF --><!-- IF S_IN_MCP -->{L_MCP} - <!-- ELSEIF S_IN_UCP -->{L_UCP} - <!-- ENDIF -->{PAGE_TITLE}<!-- IF S_VIEWTOPIC or S_VIEWFORUM --> - {SITENAME}<!-- ENDIF --></title>
 
diff --git a/phpBB/styles/prosilver/template/simple_header.html b/phpBB/styles/prosilver/template/simple_header.html
index 610e5d5582..6d22a074be 100644
--- a/phpBB/styles/prosilver/template/simple_header.html
+++ b/phpBB/styles/prosilver/template/simple_header.html
@@ -3,8 +3,6 @@
 <head>
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width" />
-<meta name="keywords" content="" />
-<meta name="description" content="" />
 {META}
 <title>{SITENAME} &bull; <!-- IF S_IN_MCP -->{L_MCP} &bull; <!-- ELSEIF S_IN_UCP -->{L_UCP} &bull; <!-- ENDIF -->{PAGE_TITLE}</title>
 
diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index ebb7b3be4d..4741154889 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -2,8 +2,6 @@
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
 <meta charset="utf-8">
-<meta name="keywords" content="" />
-<meta name="description" content="" />
 {META}
 <title><!-- IF UNREAD_NOTIFICATIONS_COUNT -->({UNREAD_NOTIFICATIONS_COUNT}) <!-- ENDIF --><!-- IF not S_VIEWTOPIC and not S_VIEWFORUM -->{SITENAME} - <!-- ENDIF --><!-- IF S_IN_MCP -->{L_MCP} - <!-- ELSEIF S_IN_UCP -->{L_UCP} - <!-- ENDIF -->{PAGE_TITLE}<!-- IF S_VIEWTOPIC or S_VIEWFORUM --> - {SITENAME}<!-- ENDIF --></title>
 
diff --git a/phpBB/styles/subsilver2/template/simple_header.html b/phpBB/styles/subsilver2/template/simple_header.html
index 0c3dff4a05..d292c4594a 100644
--- a/phpBB/styles/subsilver2/template/simple_header.html
+++ b/phpBB/styles/subsilver2/template/simple_header.html
@@ -2,8 +2,6 @@
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
 <meta charset="utf-8">
-<meta name="keywords" content="" />
-<meta name="description" content="" />
 {META}
 <title>{SITENAME} &bull; <!-- IF S_IN_MCP -->{L_MCP} &bull; <!-- ELSEIF S_IN_UCP -->{L_UCP} &bull; <!-- ENDIF -->{PAGE_TITLE}</title>
 
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index be991da317..d186d468df 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -392,10 +392,15 @@ $sql_array = array(
 * Event to modify the SQL query before the topic data is retrieved
 *
 * @event core.viewforum_get_topic_data
-* @var	array	sql_array		The SQL array to get the data of all topics
+* @var	array	forum_data			Array with forum data
+* @var	array	sql_array			The SQL array to get the data of all topics
 * @since 3.1.0-a1
+* @change 3.1.0-RC4 Added forum_data var 
 */
-$vars = array('sql_array');
+$vars = array(
+	'forum_data',
+	'sql_array',
+);
 extract($phpbb_dispatcher->trigger_event('core.viewforum_get_topic_data', compact($vars)));
 
 $sql_approved = ' AND ' . $phpbb_content_visibility->get_visibility_sql('topic', $forum_id, 't.');
diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php
index a03a81a15e..708d7c2349 100644
--- a/phpBB/viewonline.php
+++ b/phpBB/viewonline.php
@@ -357,22 +357,7 @@ while ($row = $db->sql_fetchrow($result))
 		break;
 	}
 
-	/**
-	* Overwrite the location's name and URL, which are displayed in the list
-	*
-	* @event core.viewonline_overwrite_location
-	* @var	array	on_page			File name and query string
-	* @var	array	row				Array with the users sql row
-	* @var	string	location		Page name to displayed in the list
-	* @var	string	location_url	Page url to displayed in the list
-	* @var	array	forum_data		Array with forum data
-	* @since 3.1.0-a1
-	* @change 3.1.0-a2 Added var forum_data
-	*/
-	$vars = array('on_page', 'row', 'location', 'location_url', 'forum_data');
-	extract($phpbb_dispatcher->trigger_event('core.viewonline_overwrite_location', compact($vars)));
-
-	$template->assign_block_vars('user_row', array(
+	$template_row = array(
 		'USERNAME' 			=> $row['username'],
 		'USERNAME_COLOUR'	=> $row['user_colour'],
 		'USERNAME_FULL'		=> $username_full,
@@ -389,7 +374,26 @@ while ($row = $db->sql_fetchrow($result))
 		'S_USER_HIDDEN'		=> $s_user_hidden,
 		'S_GUEST'			=> ($row['user_id'] == ANONYMOUS) ? true : false,
 		'S_USER_TYPE'		=> $row['user_type'],
-	));
+	);
+
+	/**
+	* Overwrite the location's name and URL, which are displayed in the list
+	*
+	* @event core.viewonline_overwrite_location
+	* @var	array	on_page			File name and query string
+	* @var	array	row				Array with the users sql row
+	* @var	string	location		Page name to be displayed in the list
+	* @var	string	location_url	Page url to be displayed in the list
+	* @var	array	forum_data		Array with forum data
+	* @var	array	template_row	Array with template variables for the user row
+	* @since 3.1.0-a1
+	* @change 3.1.0-a2 Added var forum_data
+	* @change 3.1.0-RC4 Added var template_row
+	*/
+	$vars = array('on_page', 'row', 'location', 'location_url', 'forum_data', 'template_row');
+	extract($phpbb_dispatcher->trigger_event('core.viewonline_overwrite_location', compact($vars)));
+
+	$template->assign_block_vars('user_row', $template_row);
 }
 $db->sql_freeresult($result);
 unset($prev_id, $prev_ip);