From 0515cd0ecd48494058e12f96233199026133124c Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Thu, 3 Nov 2011 16:44:45 +0000 Subject: Fixed tilt library loading location. --- lib/mauve/web_interface.rb | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'lib/mauve') diff --git a/lib/mauve/web_interface.rb b/lib/mauve/web_interface.rb index 716aaf3..b998ad8 100644 --- a/lib/mauve/web_interface.rb +++ b/lib/mauve/web_interface.rb @@ -5,7 +5,18 @@ require 'json' require 'mauve/authentication' -require 'sinatra/tilt' +tilt_lib = "tilt" +begin + require tilt_lib +rescue LoadError => ex + if tilt_lib == "tilt" + tilt_lib = "sinatra/tilt" + retry + end + + raise ex +end + require 'sinatra/base' require 'sinatra-partials' -- cgit v1.2.1