wp_title shouldn't use category_name if cat is also specified. Props majelbstoat. fixes #3902

git-svn-id: http://svn.automattic.com/wordpress/trunk@4976 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-includes/general-template.php

@@ -165,8 +165,7 @@ function wp_title($sep = '»', $display = true) {
 			// category exclusion
 			if ( !stristr($cat,'-') )
 				$title = apply_filters('single_cat_title', get_the_category_by_ID($cat));
-	}
-	if ( !empty($category_name) ) {
+	} elseif ( !empty($category_name) ) {
 		if ( stristr($category_name,'/') ) {
 				$category_name = explode('/',$category_name);
 				if ( $category_name[count($category_name)-1] )