9 files changed, 66 insertions, 36 deletions
diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html
index 4f67f46e24..76ea801de0 100644
--- a/phpBB/adm/style/acp_logs.html
+++ b/phpBB/adm/style/acp_logs.html
@@ -8,7 +8,7 @@
 
 <form id="list" method="post" action="{U_ACTION}">
 
-<fieldset class="display-options" style="float: left">
+<fieldset class="display-options search-box">
 	{L_SEARCH_KEYWORDS}{L_COLON} <input type="text" name="keywords" value="{S_KEYWORDS}" />&nbsp;<input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
 </fieldset>
 
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index b83750875a..b03cb0ba24 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -109,6 +109,14 @@ hr {
 	text-align: center;
 }
 
+.search-box {
+	float: left;
+}
+
+.rtl .search-box {
+	float: right;
+}
+
 .small {
 	font-size: 0.85em;
 }
@@ -1773,6 +1781,7 @@ li.pagination ul {
 	margin: 10px 0;
 	color: #FFFFFF;
 	text-align: center;
+	clear: both;
 }
 
 .success {
diff --git a/phpBB/assets/javascript/editor.js b/phpBB/assets/javascript/editor.js
index dfc7dab525..5fd4f7eae3 100644
--- a/phpBB/assets/javascript/editor.js
+++ b/phpBB/assets/javascript/editor.js
@@ -266,10 +266,6 @@ function mozWrap(txtarea, open, close) {
 	var selEnd = txtarea.selectionEnd;
 	var scrollTop = txtarea.scrollTop;
 
-	if (selEnd === 1 || selEnd === 2) {
-		selEnd = selLength;
-	}
-
 	var s1 = (txtarea.value).substring(0,selStart);
 	var s2 = (txtarea.value).substring(selStart, selEnd);
 	var s3 = (txtarea.value).substring(selEnd, selLength);
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 29cea477e4..ad142b1cca 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1573,7 +1573,7 @@ function get_folder_status($folder_id, $folder)
 		'cur'			=> $folder['num_messages'],
 		'remaining'		=> ($user->data['message_limit']) ? $user->data['message_limit'] - $folder['num_messages'] : 0,
 		'max'			=> $user->data['message_limit'],
-		'percent'		=> ($user->data['message_limit']) ? (($user->data['message_limit'] > 0) ? round(($folder['num_messages'] / $user->data['message_limit']) * 100) : 100) : 0,
+		'percent'		=> ($user->data['message_limit']) ? (($user->data['message_limit'] > 0) ? floor(($folder['num_messages'] / $user->data['message_limit']) * 100) : 100) : 0,
 	);
 
 	$return['message']	= $user->lang('FOLDER_STATUS_MSG', $user->lang('MESSAGES_COUNT', (int) $return['max']), $return['cur'], $return['percent']);
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 38ae34c66c..e4479f07b0 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -363,12 +363,16 @@ function user_add($user_row, $cp_data = false)
 }
 
 /**
-* Remove User
-* @param $mode Either 'retain' or 'remove'
-*/
+ * Remove User
+ *
+ * @param string	$mode		Either 'retain' or 'remove'
+ * @param mixed		$user_ids	Either an array of integers or an integer
+ * @param bool		$retain_username
+ * @return bool
+ */
 function user_delete($mode, $user_ids, $retain_username = true)
 {
-	global $cache, $config, $db, $user, $auth, $phpbb_dispatcher;
+	global $cache, $config, $db, $user, $phpbb_dispatcher;
 	global $phpbb_root_path, $phpEx;
 
 	$db->sql_transaction('begin');
@@ -555,11 +559,6 @@ function user_delete($mode, $user_ids, $retain_username = true)
 			WHERE ' . $db->sql_in_set('poster_id', $user_ids);
 		$db->sql_query($sql);
 
-		$sql = 'UPDATE ' . POSTS_TABLE . '
-			SET post_edit_user = ' . ANONYMOUS . '
-			WHERE ' . $db->sql_in_set('post_edit_user', $user_ids);
-		$db->sql_query($sql);
-
 		$sql = 'UPDATE ' . USERS_TABLE . '
 			SET user_posts = user_posts + ' . $added_guest_posts . '
 			WHERE user_id = ' . ANONYMOUS;
@@ -589,6 +588,30 @@ function user_delete($mode, $user_ids, $retain_username = true)
 
 	$cache->destroy('sql', MODERATOR_CACHE_TABLE);
 
+	// Change user_id to anonymous for posts edited by this user
+	$sql = 'UPDATE ' . POSTS_TABLE . '
+		SET post_edit_user = ' . ANONYMOUS . '
+		WHERE ' . $db->sql_in_set('post_edit_user', $user_ids);
+	$db->sql_query($sql);
+
+	// Change user_id to anonymous for pms edited by this user
+	$sql = 'UPDATE ' . PRIVMSGS_TABLE . '
+		SET message_edit_user = ' . ANONYMOUS . '
+		WHERE ' . $db->sql_in_set('message_edit_user', $user_ids);
+	$db->sql_query($sql);
+
+	// Change user_id to anonymous for posts deleted by this user
+	$sql = 'UPDATE ' . POSTS_TABLE . '
+		SET post_delete_user = ' . ANONYMOUS . '
+		WHERE ' . $db->sql_in_set('post_delete_user', $user_ids);
+	$db->sql_query($sql);
+
+	// Change user_id to anonymous for topics deleted by this user
+	$sql = 'UPDATE ' . TOPICS_TABLE . '
+		SET topic_delete_user = ' . ANONYMOUS . '
+		WHERE ' . $db->sql_in_set('topic_delete_user', $user_ids);
+	$db->sql_query($sql);
+
 	// Delete user log entries about this user
 	$sql = 'DELETE FROM ' . LOG_TABLE . '
 		WHERE ' . $db->sql_in_set('reportee_id', $user_ids);
diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php
index 30b364821d..da8b848fa5 100644
--- a/phpBB/phpbb/session.php
+++ b/phpBB/phpbb/session.php
@@ -441,12 +441,13 @@ class session
 
 					if (!$session_expired)
 					{
-						// 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())
+						// 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']))
 						{
 							$sql_ary = array('session_time' => $this->time_now);
 
-							if ($this->update_session_page)
+							// Do not update the session page for ajax requests, so the view online still works as intended
+							if ($this->update_session_page && !$request->is_ajax())
 							{
 								$sql_ary['session_page'] = substr($this->page['page'], 0, 199);
 								$sql_ary['session_forum_id'] = $this->page['forum'];
diff --git a/phpBB/phpbb/template/base.php b/phpBB/phpbb/template/base.php
index ab0e1f281d..9a40702ba8 100644
--- a/phpBB/phpbb/template/base.php
+++ b/phpBB/phpbb/template/base.php
@@ -142,11 +142,11 @@ abstract class base implements template
 	{
 		global $phpbb_hook;
 
-		if (!empty($phpbb_hook) && $phpbb_hook->call_hook(array(__CLASS__, $method), $handle, $this))
+		if (!empty($phpbb_hook) && $phpbb_hook->call_hook(array('template', $method), $handle, $this))
 		{
-			if ($phpbb_hook->hook_return(array(__CLASS__, $method)))
+			if ($phpbb_hook->hook_return(array('template', $method)))
 			{
-				$result = $phpbb_hook->hook_return_result(array(__CLASS__, $method));
+				$result = $phpbb_hook->hook_return_result(array('template', $method));
 				return array($result);
 			}
 		}
diff --git a/phpBB/styles/prosilver/theme/forms.css b/phpBB/styles/prosilver/theme/forms.css
index cbdeab11f9..f08a8a9691 100644
--- a/phpBB/styles/prosilver/theme/forms.css
+++ b/phpBB/styles/prosilver/theme/forms.css
@@ -129,6 +129,10 @@ dd select {
 	width: auto;
 }
 
+dd select[multiple] {
+	width: 100%;
+}
+
 dd textarea {
 	width: 85%;
 }
@@ -410,7 +414,7 @@ input.button1:focus, input.button2:focus, input.button3:focus {
 
 .search-header a.button {
 	border: 0;
-	border-left: 1;
+	border-left: 1px;
 	padding: 3px 5px 3px 4px;
 }
 
diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css
index 698b9efd75..ed3ba61334 100644
--- a/phpBB/styles/prosilver/theme/responsive.css
+++ b/phpBB/styles/prosilver/theme/responsive.css
@@ -161,8 +161,7 @@ ul.topiclist.forums dd.topics dfn, ul.topiclist.topics dd.posts dfn {
 	font-weight: normal;
 }
 
-@media only screen and (max-width: 550px), only screen and (max-device-width: 550px)
-{
+@media only screen and (max-width: 550px), only screen and (max-device-width: 550px) {
 	ul.topiclist.forums dt {
 		margin-right: 0;
 	}
@@ -191,8 +190,7 @@ ul.topiclist li.row dt a.subforum {
 
 /* Notifications list
 ----------------------------------------*/
-@media only screen and (max-width: 350px), only screen and (max-device-width: 350px)
-{
+@media only screen and (max-width: 350px), only screen and (max-device-width: 350px) {
 	.dropdown-extended .dropdown-contents {
 		width: auto;
 	}
@@ -344,22 +342,23 @@ fieldset.quick-login label[for="autologin"] {
 	min-width: 50%;
 }
 
-@media only screen and (max-width: 500px), only screen and (max-device-width: 500px)
-{
+@media only screen and (max-width: 500px), only screen and (max-device-width: 500px) {
+	dd label {
+		white-space: normal;
+	}
+
 	select, .inputbox {
 		max-width: 260px;
 	}
 }
 
-@media only screen and (max-width: 430px), only screen and (max-device-width: 430px)
-{
+@media only screen and (max-width: 430px), only screen and (max-device-width: 430px) {
 	.section-viewtopic .search-box .inputbox {
 		width: 110px;
 	}
 }
 
-@media only screen and (max-width: 320px), only screen and (max-device-width: 320px)
-{
+@media only screen and (max-width: 320px), only screen and (max-device-width: 320px) {
 	select, .inputbox {
 		max-width: 240px;
 	}
@@ -372,8 +371,7 @@ fieldset.quick-login label[for="autologin"] {
 	width: auto;
 }
 
-@media only screen and (max-width: 500px), only screen and (max-device-width: 500px)
-{
+@media only screen and (max-width: 500px), only screen and (max-device-width: 500px) {
 	dl.details dt, dl.details dd {
 		width: auto;
 		float: none;
@@ -513,8 +511,7 @@ fieldset.display-actions {
 	width: 100%;
 }
 
-@media only screen and (max-width: 500px), only screen and (max-device-width: 500px)
-{
+@media only screen and (max-width: 500px), only screen and (max-device-width: 500px) {
 	p.responsive-center {
 		float: none;
 		text-align: center;