Merge commit 'zuk/master'

xwmx · May 6, 2009 · ed9b5e3 · ed9b5e3
2 parents 7b914ab + adcaede
commit ed9b5e3
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/lib/camping/reloader.rb b/lib/camping/reloader.rb
@@ -132,8 +132,12 @@ def mtime
 
       # Figures out the full path of a required file. 
       def full_path(req)
-        dir = File.expand_path($LOAD_PATH.detect { |l| File.exists?(File.join(l, req)) })
-        File.join(dir, req)
+        dir = $LOAD_PATH.detect { |l| File.exists?(File.join(l, req)) }
+        if dir 
+          File.join(File.expand_path(dir), req)
+        else
+          req
+        end
       end
     end