Merge branch 'master' of github.com:neuf/studio11-theme

functions.php

@@ -173,7 +173,7 @@ function thumbnail_in_header($title)
 
 add_filter('the_title', 'thumbnail_in_header');*/
 
-function menu_links($items, $args)
+function menu_links($items, $args = null)
 {
 	foreach($items as &$item)
 		if(in_array($item->object, array('page','post','category')))

header.php

@@ -113,7 +113,7 @@ $j(function()
 	
 	var modal_not_match = Array(/wp-admin/);
 	
-$j(".content .post,#header [href]").live('click',function(e)
+$j(".content .post,#header [href],.event-table tr").live('click',function(e)
 	{
 		preModal = window.location.href;
 				e.preventDefault();
@@ -123,6 +123,9 @@ $j(".content .post,#header [href]").live('click',function(e)
 		else
 			href = $j(this).find("[href]").attr('href');
 		
+		if(!href)
+			return;
+		
 		for(var i = 0; i < modal_match.length; i++)
 			if(href.match(modal_match[i]))
 				break;