<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -121,7 +121,8 @@ module Merb::Cache::ControllerInstanceMethods
     return unless pages &amp;&amp; pages.key?(action)
     path = request.path.chomp(&quot;/&quot;)
     path = &quot;index&quot; if path.empty?
-    ext = &quot;.&quot; + (params[:format].empty? ? DEFAULT_PAGE_EXTENSION : params[:format])
+    no_format = params[:format].nil? || params[:format].empty?
+    ext = &quot;.&quot; + (no_format ? DEFAULT_PAGE_EXTENSION : params[:format])
     ext = nil if File.extname(path) == ext
     cache_file = Merb::Controller._cache.config[:cache_html_directory] / &quot;#{path}#{ext}&quot;
     if data</diff>
      <filename>merb-cache/lib/merb-cache/cache-page.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>8690d673201d6cff9019dc26291af773eafdb4a0</id>
    </parent>
  </parents>
  <author>
    <name>booss</name>
    <email>alex.boussinet@gmail.com</email>
  </author>
  <url>http://github.com/wycats/merb-more/commit/4f87aceb53318e5f9122577b6e646f6c139d1532</url>
  <id>4f87aceb53318e5f9122577b6e646f6c139d1532</id>
  <committed-date>2008-05-05T02:37:39-07:00</committed-date>
  <authored-date>2008-05-05T02:37:39-07:00</authored-date>
  <message>Cache error with default content-type fixed. Closing #125</message>
  <tree>60bf5b2e7724935edb7dced8374068816d733a42</tree>
  <committer>
    <name>booss</name>
    <email>alex.boussinet@gmail.com</email>
  </committer>
</commit>
