Merge branch 'pr/107' into dev

qa-include/qa-app-favorites.php

@@ -30,16 +30,27 @@
 	}
 
 
+	/**
+	 * Set an entity to be favorited or removed from favorites. Handles event reporting.
+	 *
+	 * @param int $userid ID of user assigned to the favorite
+	 * @param string $handle Username of user
+	 * @param string $cookieid Cookie ID of user
+	 * @param string $entitytype Entity type code (one of QA_ENTITY_* constants)
+	 * @param string $entityid ID of the entity being favorited (e.g. postid for questions)
+	 * @param bool $favorite Whether to add favorite (true) or remove favorite (false)
+	 */
 	function qa_user_favorite_set($userid, $handle, $cookieid, $entitytype, $entityid, $favorite)
-/*
-	If $favorite is true, set $entitytype and $entityid to be favorites of $userid with $handle and $cookieid, otherwise
-	remove them from its favorites list. Handles event reporting.
-*/
 	{
 		require_once QA_INCLUDE_DIR.'qa-db-favorites.php';
 		require_once QA_INCLUDE_DIR.'qa-app-limits.php';
 		require_once QA_INCLUDE_DIR.'qa-app-updates.php';
 
+		// Make sure the user is not favoriting themselves
+		if ($entitytype == QA_ENTITY_USER && $userid == $entityid) {
+			return;
+		}
+
 		if ($favorite)
 			qa_db_favorite_create($userid, $entitytype, $entityid);
 		else

qa-include/qa-page-user-profile.php

@@ -347,7 +347,7 @@
 	$qa_content['title'] = qa_lang_html_sub('profile/user_x', $userhtml);
 	$qa_content['error'] = @$errors['page'];
 
-	if (isset($loginuserid) && !QA_FINAL_EXTERNAL_USERS) {
+	if (isset($loginuserid) && $loginuserid != $useraccount['userid'] && !QA_FINAL_EXTERNAL_USERS) {
 		$favoritemap = qa_get_favorite_non_qs_map();
 		$favorite = @$favoritemap['user'][$useraccount['userid']];