diff options
| author | Leonardo Saraiva <vyper@maneh.org> | 2013-02-24 20:51:31 -0300 |
|---|---|---|
| committer | Leonardo Saraiva <vyper@maneh.org> | 2013-02-24 20:51:31 -0300 |
| commit | 2fe9da91f5a4b5ba3edaee47ee24dbce523e739e (patch) | |
| tree | cca3792ae030b550015633b4b855451fa8455bc3 /plugins/backtick_code_block.rb | |
| parent | e1020ed888439a480cb13af2585f9fea5283c609 (diff) | |
| parent | 4790b939807be4d9abcc567f02773ff24b99320d (diff) | |
| download | my_new_personal_website-2fe9da91f5a4b5ba3edaee47ee24dbce523e739e.tar.xz my_new_personal_website-2fe9da91f5a4b5ba3edaee47ee24dbce523e739e.zip | |
Merge branch 'master' of github.com:imathis/octopress
Conflicts:
plugins/category_generator.rb
Diffstat (limited to '')
| -rw-r--r-- | plugins/backtick_code_block.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/backtick_code_block.rb b/plugins/backtick_code_block.rb index 40e7900b..8e2c1141 100644 --- a/plugins/backtick_code_block.rb +++ b/plugins/backtick_code_block.rb @@ -2,7 +2,7 @@ require './plugins/pygments_code' module BacktickCodeBlock include HighlightCode - AllOptions = /([^\s]+)\s+(.+?)(https?:\/\/\S+)\s*(.+)?/i + AllOptions = /([^\s]+)\s+(.+?)\s+(https?:\/\/\S+|\/\S+)\s*(.+)?/i LangCaption = /([^\s]+)\s*(.+)?/i def render_code_block(input) @options = nil |