render_error_pages.rb in passenger-2.1.3

- old
+ new

@@ -13,14 +13,15 @@
 #
 #  You should have received a copy of the GNU General Public License along
 #  with this program; if not, write to the Free Software Foundation, Inc.,
 #  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$LOAD_PATH << "#{File.dirname(__FILE__)}/../lib"
-require 'passenger/html_template'
-require 'passenger/spawn_manager'
-require 'passenger/platform_info'
+$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../lib")
+$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../ext")
+require 'phusion_passenger/html_template'
+require 'phusion_passenger/spawn_manager'
+require 'phusion_passenger/platform_info'
 include PhusionPassenger
 
 if !defined?(Mysql::Error)
 	module Mysql
 		class Error < StandardError
@@ -99,10 +100,10 @@
 	
 	e = StandardError.new("Some error message")
 	render_error_page(e, 'general_error.html',
 		'general_error')
 	
-	e = StandardError.new("Some error message")
+	e = AppInitError.new("Some error message", create_dummy_exception)
 	render_error_page(e, 'app_exited.html', 'app_exited_during_initialization')
 end
 
 start