From eb368d31e1127d94952a6c09bd7000c9e7078f2f Mon Sep 17 00:00:00 2001 From: theshka Date: Fri, 29 May 2015 13:22:52 -0400 Subject: [PATCH 1/2] fix date_formatted issue --- lib/pico.php | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/lib/pico.php b/lib/pico.php index 91d8267..9a5c8a6 100644 --- a/lib/pico.php +++ b/lib/pico.php @@ -1,5 +1,4 @@ parse_content($content); $this->run_hooks('after_parse_content', array(&$content)); $this->run_hooks('content_parsed', array(&$content)); // Depreciated @ v0.8 - + // Get all the pages $pages = $this->get_pages($settings['base_url'], $settings['pages_order_by'], $settings['pages_order'], $settings['excerpt_length']); $prev_page = array(); @@ -108,7 +107,7 @@ class Pico { $this->run_hooks('after_render', array(&$output)); echo $output; } - + /** * Load any plugins */ @@ -152,7 +151,7 @@ class Pico { protected function read_file_meta($content) { global $config; - + $headers = array( 'title' => 'Title', 'description' => 'Description', @@ -172,7 +171,7 @@ class Pico { $headers[ $field ] = ''; } } - + if(isset($headers['date'])) $headers['date_formatted'] = utf8_encode(strftime($config['date_format'], strtotime($headers['date']))); return $headers; @@ -192,7 +191,7 @@ class Pico { 'site_title' => 'Pico', 'base_url' => $this->base_url(), 'theme' => 'default', - 'date_format' => 'jS M Y', + 'date_format' => '%D %T', 'twig_config' => array('cache' => false, 'autoescape' => false, 'debug' => false), 'pages_order_by' => 'alpha', 'pages_order' => 'asc', @@ -205,7 +204,7 @@ class Pico { return $config; } - + /** * Get a list of pages * @@ -217,7 +216,7 @@ class Pico { protected function get_pages($base_url, $order_by = 'alpha', $order = 'asc', $excerpt_length = 50) { global $config; - + $pages = $this->get_files($config['content_dir'], CONTENT_EXT); $sorted_pages = array(); $date_id = 0; @@ -232,7 +231,7 @@ class Pico { if (in_array(substr($page, -1), array('~','#'))) { unset($pages[$key]); continue; - } + } // Get title and format $page $page_content = file_get_contents($page); $page_meta = $this->read_file_meta($page_content); @@ -262,13 +261,13 @@ class Pico { } else $sorted_pages[$page] = $data; } - + if($order == 'desc') krsort($sorted_pages); else ksort($sorted_pages); - + return $sorted_pages; } - + /** * Processes any hooks and runs them * @@ -318,14 +317,14 @@ class Pico { } return $protocol; } - + /** * Helper function to recusively get all files in a directory * * @param string $directory start directory * @param string $ext optional limit to file extensions * @return array the matched files - */ + */ protected function get_files($directory, $ext = '') { $array_items = array(); @@ -347,14 +346,14 @@ class Pico { } return $array_items; } - + /** * Helper function to limit the words in a string * * @param string $string the given string * @param int $word_limit the number of words to limit to * @return string the limited string - */ + */ protected function limit_words($string, $word_limit) { $words = explode(' ',$string); From 28a6b721cec48c126dbbc1147fd4bc0fede7b7f5 Mon Sep 17 00:00:00 2001 From: theshka Date: Fri, 29 May 2015 13:23:20 -0400 Subject: [PATCH 2/2] fix date_formatted issue --- config.php.template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/config.php.template b/config.php.template index 412deea..5dfa75b 100644 --- a/config.php.template +++ b/config.php.template @@ -1,8 +1,8 @@ - false, // To enable Twig caching change this to CACHE_DIR -// 'autoescape' => false, // Autoescape Twig vars -// 'debug' => false // Enable Twig debug +// 'cache' => false, // To enable Twig caching change this to CACHE_DIR +// 'autoescape' => false, // Autoescape Twig vars +// 'debug' => false // Enable Twig debug // ); /* * 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'] = 'asc'; // Order pages "asc" or "desc" // $config['excerpt_length'] = 50; // The pages excerpt length (in words)