Merge pull request #230 from theshka/master

fix date_formatted issue
pico-3.0-alpha
Tyler Heshka 10 years ago
commit 48e5c9e500
  1. 8
      config.php.template
  2. 3
      lib/pico.php

@ -26,15 +26,15 @@
*/ */
// $config['theme'] = 'default'; // Set the theme (defaults to "default") // $config['theme'] = 'default'; // Set the theme (defaults to "default")
// $config['twig_config'] = array( // Twig settings // $config['twig_config'] = array( // Twig settings
// 'cache' => false, // To enable Twig caching change this to CACHE_DIR // 'cache' => false, // To enable Twig caching change this to CACHE_DIR
// 'autoescape' => false, // Autoescape Twig vars // 'autoescape' => false, // Autoescape Twig vars
// 'debug' => false // Enable Twig debug // 'debug' => false // Enable Twig debug
// ); // );
/* /*
* CONTENT * CONTENT
*/ */
// $config['date_format'] = 'jS M Y'; // Set the PHP date format as described here: http://php.net/manual/en/function.strftime.php // $config['date_format'] = '%D %T'; // Set the PHP date format as described here: http://php.net/manual/en/function.strftime.php
// $config['pages_order_by'] = 'alpha'; // Order pages by "alpha" or "date" // $config['pages_order_by'] = 'alpha'; // Order pages by "alpha" or "date"
// $config['pages_order'] = 'asc'; // Order pages "asc" or "desc" // $config['pages_order'] = 'asc'; // Order pages "asc" or "desc"
// $config['excerpt_length'] = 50; // The pages excerpt length (in words) // $config['excerpt_length'] = 50; // The pages excerpt length (in words)

@ -1,5 +1,4 @@
<?php <?php
use \ParsedownExtra;
/** /**
* Pico * Pico
@ -192,7 +191,7 @@ class Pico {
'site_title' => 'Pico', 'site_title' => 'Pico',
'base_url' => $this->base_url(), 'base_url' => $this->base_url(),
'theme' => 'default', 'theme' => 'default',
'date_format' => 'jS M Y', 'date_format' => '%D %T',
'twig_config' => array('cache' => false, 'autoescape' => false, 'debug' => false), 'twig_config' => array('cache' => false, 'autoescape' => false, 'debug' => false),
'pages_order_by' => 'alpha', 'pages_order_by' => 'alpha',
'pages_order' => 'asc', 'pages_order' => 'asc',

Loading…
Cancel
Save