Merge pull request padrino#648 from chromaticbum/master

Fixes issue padrino#631
newhavenrb · Aug 30, 2011 · 529ec71 · 529ec71
2 parents 8496dca + 0a09adc
commit 529ec71
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/padrino-core/lib/padrino-core/application.rb b/padrino-core/lib/padrino-core/application.rb
@@ -54,11 +54,12 @@ def reload!
         logger.devel "Reloading #{self}"
         @_dependencies = nil # Reset dependencies
         reset! # Reset sinatra app
-        reset_routes! # Remove all existing user-defined application routes
+        reset_router! # Reset all routes
         Padrino.require_dependencies(self.app_file, :force => true) # Reload the app file
-        require_dependencies # Reload dependencies
         register_initializers # Reload our middlewares
+        require_dependencies # Reload dependencies
         default_filters! # Reload filters
+        default_routes!  # Reload default routes
         default_errors!  # Reload our errors
         I18n.reload! if defined?(I18n) # Reload also our translations
       end