diff options
| author | Kornelius Kalnbach <murphy@rubychan.de> | 2011-09-19 01:51:49 +0200 |
|---|---|---|
| committer | Kornelius Kalnbach <murphy@rubychan.de> | 2011-09-19 01:51:49 +0200 |
| commit | b7a6089b05f9f32e4411494e98743135de526276 (patch) | |
| tree | 7b9b2e725eb2bed2eb7fdd7d28118bd16495e2a3 /lib/coderay | |
| parent | 2f97912d6372b3edde924f83ed283b97f6472273 (diff) | |
| parent | c144bfd8918d00e1e1588829f248a88c0561e673 (diff) | |
| download | coderay-b7a6089b05f9f32e4411494e98743135de526276.tar.gz | |
Merge branch 'master' into tokens-proxy
Diffstat (limited to 'lib/coderay')
| -rw-r--r-- | lib/coderay/encoders/json.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/coderay/encoders/json.rb b/lib/coderay/encoders/json.rb index 0a95397..a9e40dc 100644 --- a/lib/coderay/encoders/json.rb +++ b/lib/coderay/encoders/json.rb @@ -21,8 +21,8 @@ module Encoders require 'json' rescue LoadError begin - require 'rubygems' - gem "json" + require 'rubygems' unless defined? Gem + gem 'json' require 'json' rescue LoadError $stderr.puts "The JSON encoder needs the JSON library.\n" \ |