Merge branch '5.0RC'5.0

1 files changed, 18 insertions, 0 deletions

diff --git a/vendor/michelf/php-markdown/test/resources/markdown.mdtest/Auto links.xhtml b/vendor/michelf/php-markdown/test/resources/markdown.mdtest/Auto links.xhtml
new file mode 100644
index 000000000..f8df9852c
--- /dev/null
+++ b/vendor/michelf/php-markdown/test/resources/markdown.mdtest/Auto links.xhtml
@@ -0,0 +1,18 @@
+<p>Link: <a href="http://example.com/">http://example.com/</a>.</p>
+
+<p>With an ampersand: <a href="http://example.com/?foo=1&amp;bar=2">http://example.com/?foo=1&amp;bar=2</a></p>
+
+<ul>
+<li>In a list?</li>
+<li><a href="http://example.com/">http://example.com/</a></li>
+<li>It should.</li>
+</ul>
+
+<blockquote>
+  <p>Blockquoted: <a href="http://example.com/">http://example.com/</a></p>
+</blockquote>
+
+<p>Auto-links should not occur here: <code>&lt;http://example.com/&gt;</code></p>
+
+<pre><code>or here: &lt;http://example.com/&gt;
+</code></pre>