0ct0pu5/Pico
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed current page

Browse source 
current page was find by title which could be duplicated in some files,
so changed to the url which is unique
This commit is contained in:
ahmet2106 2013-08-03 18:16:03 +02:00
parent cf4fd9024f
commit c825e107a3
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
lib/pico.php
View file

@ -66,7 +66,7 @@ class Pico {
$current_page = array();
$next_page = array();
while($current_page = current($pages)){
if($meta['title'] == $current_page['title']){
if($this->gen_url($file) == $current_page['url']){
break;
}
next($pages);
@ -223,12 +223,9 @@ class Pico {
$page_content = file_get_contents($page);
$page_meta = $this->read_file_meta($page_content);
$page_content = $this->parse_content($page_content);
$url = str_replace(CONTENT_DIR, $base_url .'/', $page);
$url = str_replace('index'. CONTENT_EXT, '', $url);
$url = str_replace(CONTENT_EXT, '', $url);
$data = array(
'title' => $page_meta['title'],
'url' => $url,
'url' => $this->gen_url($page),
'author' => $page_meta['author'],
'date' => $page_meta['date'],
'date_formatted' => date($config['date_format'], strtotime($page_meta['date'])),
@ -333,6 +330,20 @@ class Pico {
$words = explode(' ',$string);
return trim(implode(' ', array_splice($words, 0, $word_limit))) .'...';
}
/**
* Helper function to generate page url
*
* @param string $page a content file
* @return string the absolute url to the file
*/
private function gen_url($page)
{
$url = str_replace(CONTENT_DIR, $this->base_url() .'/', $page);
$url = str_replace('index'. CONTENT_EXT, '', $url);
$url = str_replace(CONTENT_EXT, '', $url);
return $url;
}
}