<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -171,7 +171,8 @@ module RestrictedSubdomain
         
         def with_subdomain_scope(&amp;block)
           if subdomain_klass.current
-            with_scope({ :find =&gt; { :conditions =&gt; [&quot;#{table_name}.#{subdomain_symbol}_id = ?&quot;, subdomain_klass.current.id ] } }, :merge, &amp;block)
+            subdomain_id = subdomain_klass.current[subdomain_klass.primary_key]
+            with_scope({ :find =&gt; { :conditions =&gt; [&quot;#{table_name}.#{subdomain_symbol}_id = ?&quot;, subdomain_id ] } }, :merge, &amp;block)
           else
             with_scope({}, :merge, &amp;block)
           end </diff>
      <filename>lib/restricted_subdomain_model.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>f87fb65f2e41cf8a222e989f12502a5f835cf19f</id>
    </parent>
  </parents>
  <author>
    <name>Andrew Coleman</name>
    <email>andrew@jupiter.olympus</email>
  </author>
  <url>http://github.com/penguincoder/acts_as_restricted_subdomain/commit/43fcdc64e9f1790419b9a2099efb3ae80d7c63d2</url>
  <id>43fcdc64e9f1790419b9a2099efb3ae80d7c63d2</id>
  <committed-date>2009-10-16T18:48:16-07:00</committed-date>
  <authored-date>2009-10-16T18:48:16-07:00</authored-date>
  <message>do not use id. that apparently causes activerecord to epicly fail into an infinite loop</message>
  <tree>0693967b111a51e53068f3615c4edb8f78f37584</tree>
  <committer>
    <name>Andrew Coleman</name>
    <email>andrew@jupiter.olympus</email>
  </committer>
</commit>
