From c1654c4751348cb68432d89e638f131083640150 Mon Sep 17 00:00:00 2001
From: westi <westi@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Wed, 17 Mar 2010 19:33:20 +0000
Subject: [PATCH] Fix notice in wp_nav_menu when the menu doesn't exist.

git-svn-id: http://svn.automattic.com/wordpress/trunk@13738 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/nav-menu-template.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wp-includes/nav-menu-template.php b/wp-includes/nav-menu-template.php
index e0b85dab50..8af7a1e62b 100644
--- a/wp-includes/nav-menu-template.php
+++ b/wp-includes/nav-menu-template.php
@@ -45,7 +45,7 @@ function wp_nav_menu( $args = array() ) {
 		}
 	}
 
-	if ( !is_wp_error($menu) )
+	if ( !is_wp_error($menu) && $menu)
 		$args->menu = $menu->term_id;
 	$nav_menu = '';