Merge pull request elkarte#1626 from emanuele45/tweaks2

Tweaks2
emanuele45 · Jun 14, 2014 · 5bf1962 · 5bf1962
2 parents eca34c6 + 7e4e7af
commit 5bf1962
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/sources/controllers/MoveTopic.controller.php b/sources/controllers/MoveTopic.controller.php
@@ -252,7 +252,7 @@ public function action_movetopic2()
 			));
 
 			// Auto remove this MOVED redirection topic in the future?
-			$redirect_expires = !empty($_POST['redirect_expires']) ? ((int) ($_POST['redirect_expires'] * 60) + time()) : 0;
+			$redirect_expires = !empty($_POST['redirect_expires']) ? (int) $_POST['redirect_expires'] : 0;
 
 			// Redirect to the MOVED topic from topic list?
 			$redirect_topic = isset($_POST['redirect_topic']) ? $topic : 0;
@@ -272,7 +272,7 @@ public function action_movetopic2()
 				'board' => $board,
 				'lock_mode' => 1,
 				'mark_as_read' => true,
-				'redirect_expires' => $redirect_expires,
+				'redirect_expires' => ($redirect_expires * 60) + time(),
 				'redirect_topic' => $redirect_topic,
 			);
 

diff --git a/sources/subs/Mentions.subs.php b/sources/subs/Mentions.subs.php
@@ -51,7 +51,7 @@ function countUserMentions($all = false, $type = '', $id_member = null)
 	$db->free_result($request);
 
 	// Counts as maintenance! :P
-	if ($all === false && empty($type))
+	if ($all === true && empty($type))
 		updateMemberdata($id_member, array('mentions' => $counts[$id_member]));
 
 	return $counts[$id_member];
@@ -432,5 +432,5 @@ function updateMentionMenuCount($status, $member_id)
 		updateMemberdata($member_id, array('mentions' => '-'));
 	// Deleting or unapproving may have been read or not, so a count is required
 	else
-		countUserMentions(false, 0, $member_id);
+		countUserMentions(false, '', $member_id);
 }
diff --git a/sources/subs/ScheduledTask.class.php b/sources/subs/ScheduledTask.class.php
@@ -1465,6 +1465,9 @@ public function user_access_mentions()
 				// And save everything for the next run
 				updateSettings(array('user_access_mentions' => serialize($user_access_mentions)));
 
+				// Count helps keep things correct
+				countUserMentions(true, '', $member);
+
 				// Run this only once for each user, it may be quite heavy, let's split up the load
 				break;
 			}

diff --git a/themes/default/css/_light/index_light.css b/themes/default/css/_light/index_light.css
@@ -771,7 +771,7 @@ div.bbc_footnotes .meaction{
 .linktree {
 	background: #fcfcfc;
 	border-top: 1px solid #ccc;
-	border-right: 2px solid #ccc;
+	border-right: 0.2em solid #ccc;
 	border-bottom: 1px solid #ccc;
 	border-radius: 2px 0 0 2px;
 }
@@ -802,7 +802,7 @@ div.bbc_footnotes .meaction{
 }
 .linktree:hover, .linktree_last {
 	border-top: 1px solid #3d6e32;
-	border-right: 2px solid #3d6e32;
+	border-right: 0.2em solid #3d6e32;
 	border-bottom: 1px solid #3d6e32;
 	background: #5ba048;
 	background-image: linear-gradient(to right, #4b863c, #5ba048);