michaelklishin (owner)

Revisions

gist: 54681 Download_button fork
public
Public Clone URL: git://gist.github.com/54681.git
Embed All Files: show embed
Diff #
raw 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22

commit d3f2cf058146bb66bae1e4327c8d4af141459d31
Author: Michael S. Klishin <michael@novemberain.com>
Date:   Thu Jan 29 22:09:18 2009 +0300
 
    Prevents init.rb from loading twice.
 
diff --git a/merb-core/lib/merb-core/bootloader.rb b/merb-core/lib/merb-core/bootloader.rb
index 2700cc4..68d4e23 100644
--- a/merb-core/lib/merb-core/bootloader.rb
+++ b/merb-core/lib/merb-core/bootloader.rb
@@ -90,9 +90,9 @@ module Merb
       def run
         Merb.started = true
         subklasses = subclasses.dup
-        until subclasses.empty?
+        until subklasses.empty?
           time = Time.now.to_i
-          bootloader = subclasses.shift
+          bootloader = subklasses.shift
           if (ENV['DEBUG'] || $DEBUG || Merb::Config[:verbose]) && Merb.logger
             Merb.logger.debug!("Loading: #{bootloader}")
           end