using composer for markdown

pico-3.0-alpha
Konrad Riedel 12 years ago
parent ec37ff4e75
commit 145915346c
  1. 5
      composer.json
  2. 3
      index.php
  3. 1732
      lib/markdown.php
  4. 6
      lib/pico.php

@ -1,5 +1,6 @@
{ {
"require": { "require": {
"twig/twig": "1.12.*" "twig/twig": "1.12.*",
"michelf/php-markdown": "1.3"
} }
} }

@ -9,8 +9,5 @@ define('THEMES_DIR', ROOT_DIR .'themes/');
define('CACHE_DIR', LIB_DIR .'cache/'); define('CACHE_DIR', LIB_DIR .'cache/');
require(ROOT_DIR .'vendor/autoload.php'); require(ROOT_DIR .'vendor/autoload.php');
require(LIB_DIR .'markdown.php');
require(LIB_DIR .'pico.php'); require(LIB_DIR .'pico.php');
$pico = new Pico(); $pico = new Pico();
?>

File diff suppressed because it is too large Load Diff

@ -1,5 +1,5 @@
<?php <?php
use \Michelf\MarkdownExtra;
/** /**
* Pico * Pico
* *
@ -132,7 +132,7 @@ class Pico {
{ {
$content = preg_replace('#/\*.+?\*/#s', '', $content); // Remove comments and meta $content = preg_replace('#/\*.+?\*/#s', '', $content); // Remove comments and meta
$content = str_replace('%base_url%', $this->base_url(), $content); $content = str_replace('%base_url%', $this->base_url(), $content);
$content = Markdown($content); $content = MarkdownExtra::defaultTransform($content);
return $content; return $content;
} }
@ -336,4 +336,4 @@ class Pico {
} }
?> ?>

Loading…
Cancel
Save