wikitext 1.11 → 1.12

Sign up to get free protection for your applications and to get access to all the features.
@@ -26,8 +26,9 @@ require 'wikitext/parser'
26
26
  class String
27
27
  def to_wikitext options = {}
28
28
  default_options = { :indent => false }
29
- Wikitext::Parser.shared_parser.parse wikitext_preprocess,
29
+ html = Wikitext::Parser.shared_parser.parse wikitext_preprocess,
30
30
  default_options.merge(options)
31
+ html.respond_to?(:html_safe) ? html.html_safe : html
31
32
  end
32
33
  alias :w :to_wikitext
33
34
 
@@ -22,5 +22,5 @@
22
22
  # POSSIBILITY OF SUCH DAMAGE.
23
23
 
24
24
  module Wikitext
25
- VERSION = '1.11'
25
+ VERSION = '1.12'
26
26
  end # module Wikitext
metadata CHANGED
@@ -4,8 +4,8 @@ version: !ruby/object:Gem::Version
4
4
  prerelease: false
5
5
  segments:
6
6
  - 1
7
- - 11
8
- version: "1.11"
7
+ - 12
8
+ version: "1.12"
9
9
  platform: ruby
10
10
  authors:
11
11
  - Wincent Colaiuta
@@ -13,7 +13,7 @@ autorequire:
13
13
  bindir: bin
14
14
  cert_chain: []
15
15
 
16
- date: 2010-04-26 00:00:00 +02:00
16
+ date: 2010-06-09 00:00:00 +02:00
17
17
  default_executable:
18
18
  dependencies:
19
19
  - !ruby/object:Gem::Dependency