Refactored Parsedown override class names

This commit is contained in:
Andy Miller
2015-01-21 13:23:53 -07:00
parent c1ef8b6399
commit 2dedd9d1a0
4 changed files with 9 additions and 9 deletions

View File

@@ -1,9 +1,9 @@
<?php
namespace Grav\Common\Markdown;
class Markdown extends \Parsedown
class Parsedown extends \Parsedown
{
use MarkdownGravLinkTrait;
use ParsedownGravTrait;
public function __construct($page)
{

View File

@@ -1,9 +1,9 @@
<?php
namespace Grav\Common\Markdown;
class MarkdownExtra extends \ParsedownExtra
class ParsedownExtra extends \ParsedownExtra
{
use MarkdownGravLinkTrait;
use ParsedownGravTrait;
public function __construct($page)
{

View File

@@ -10,7 +10,7 @@ use Grav\Common\Uri;
/**
* A trait to add some custom processing to the identifyLink() method in Parsedown and ParsedownExtra
*/
trait MarkdownGravLinkTrait
trait ParsedownGravTrait
{
use GravTrait;
protected $page;

View File

@@ -10,8 +10,8 @@ use Grav\Common\Twig;
use Grav\Common\Uri;
use Grav\Common\Grav;
use Grav\Common\Taxonomy;
use Grav\Common\Markdown\Markdown;
use Grav\Common\Markdown\MarkdownExtra;
use Grav\Common\Markdown\Parsedown;
use Grav\Common\Markdown\ParsedownExtra;
use Grav\Common\Data\Blueprint;
use RocketTheme\Toolbox\Event\Event;
use RocketTheme\Toolbox\File\MarkdownFile;
@@ -1607,9 +1607,9 @@ class Page
// get the appropriate setting for markdown extra
if (isset($this->markdown_extra) ? $this->markdown_extra : $config->get('system.pages.markdown_extra')) {
$parsedown = new MarkdownExtra($this);
$parsedown = new ParsedownExtra($this);
} else {
$parsedown = new Markdown($this);
$parsedown = new Parsedown($this);
}
$content = $parsedown->text($content);
return $content;