<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -82,7 +82,11 @@ if defined?(Merb::Plugins)
       
       # This deferred route allows permalinks to be handled, without a separate rack handler
       scope.match(&quot;/:controller&quot;, :controller =&gt; '.*').defer_to do |request, params|
-        unless (id = Feather::Article.routing[request.uri.to_s.chomp(&quot;/&quot;)]).nil?
+        # Permalinks are relative to the slice mount point, so we'll need to remove that from the request before we look up the article
+        permalink = request.uri.to_s.chomp(&quot;/&quot;)
+        permalink.gsub!(&quot;/#{::Feather.config[:path_prefix]}&quot;, &quot;&quot;) unless ::Feather.config[:path_prefix].blank?
+        # Attempt to find the article
+        unless (id = Feather::Article.routing[permalink]).nil?
           params.merge!({:controller =&gt; &quot;feather/articles&quot;, :action =&gt; &quot;show&quot;, :id =&gt; id})
         end
       end</diff>
      <filename>lib/feather.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>d493979786262113e6086faca99ed9f7555c3227</id>
    </parent>
  </parents>
  <author>
    <name>El Draper</name>
    <email>el@eldiablo.co.uk</email>
  </author>
  <url>http://github.com/mleung/feather/commit/01750bc4ae646a9aaa165ac0c10967139e281ba9</url>
  <id>01750bc4ae646a9aaa165ac0c10967139e281ba9</id>
  <committed-date>2009-03-23T16:29:28-07:00</committed-date>
  <authored-date>2009-03-23T16:29:28-07:00</authored-date>
  <message>fix for article permalinks under slices, now treated as relative to the mount point for a slice</message>
  <tree>fb41e28b3f8d1a271ac581594e96c8f64001772b</tree>
  <committer>
    <name>El Draper</name>
    <email>el@eldiablo.co.uk</email>
  </committer>
</commit>
