diff options
| author | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-09 07:27:56 +0200 |
|---|---|---|
| committer | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-09 07:27:56 +0200 |
| commit | 444054629e31bd69ee697586348572998e93bdab (patch) | |
| tree | 2a1753f85d5c14f72eaf701628e5e50b42cab328 /lib/coderay/helpers | |
| parent | 0e4858322bfc969bde1b02cab3113940654acf31 (diff) | |
| parent | 737fb3608c92506a573a79f611b94ff5d5da18e6 (diff) | |
| download | coderay-444054629e31bd69ee697586348572998e93bdab.tar.gz | |
Merge branch 'master' into sass-scanner
Conflicts:
lib/coderay/scanners/css.rb
Diffstat (limited to 'lib/coderay/helpers')
| -rw-r--r-- | lib/coderay/helpers/file_type.rb | 1 | ||||
| -rw-r--r-- | lib/coderay/helpers/plugin.rb | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/lib/coderay/helpers/file_type.rb b/lib/coderay/helpers/file_type.rb index b06b9bc..12556d0 100644 --- a/lib/coderay/helpers/file_type.rb +++ b/lib/coderay/helpers/file_type.rb @@ -99,6 +99,7 @@ module CodeRay 'mab' => :ruby, 'pas' => :delphi, 'patch' => :diff, + 'phtml' => :php, 'php' => :php, 'php3' => :php, 'php4' => :php, diff --git a/lib/coderay/helpers/plugin.rb b/lib/coderay/helpers/plugin.rb index 137c1ab..dd4e830 100644 --- a/lib/coderay/helpers/plugin.rb +++ b/lib/coderay/helpers/plugin.rb @@ -180,7 +180,6 @@ module CodeRay rescue LoadError => boom if @plugin_map_loaded if h.has_key?(:default) - warn '%p could not load plugin %p; falling back to %p' % [self, id, h[:default]] h[:default] else raise PluginNotFound, '%p could not load plugin %p: %s' % [self, id, boom] |