Merge remote-tracking branch 'origin/3.0-stable'

2013-02-10 18:05:24 -08:00 · 2013-02-10 18:05:24 -08:00 · 51a494b343
commit 51a494b343
parent 978b981e11 d553c6a88e
2 changed files with 2 additions and 1 deletions
--- a/middleman-core/lib/middleman-core/sitemap.rb
+++ b/middleman-core/lib/middleman-core/sitemap.rb
@ -70,6 +70,7 @@ module Middleman
      # Get the resource object for the current path
      # @return [Middleman::Sitemap::Resource]
      def current_resource
+        return nil unless current_path
        sitemap.find_resource_by_destination_path(current_path)
      end