mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-08 07:36:32 +02:00
Code Issues Releases Wiki Activity

Fixed conflict between page shortcodes and page plugin shortcodes. Book and Chapter listings improved and page_navigation_menu improved.

Browse Source
This commit is contained in:
Cameron
2013-02-01 18:00:53 -08:00
parent 2b05530a62
commit 405f488f31
6 changed files with 78 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_plugins/page/e_shortcode.php
View File

@@ -27,6 +27,4 @@ class page_shortcodes extends e_shortcode
}
}
?>

9
e107_plugins/page/e_sitelink.php
View File

@@ -52,7 +52,9 @@ class page_sitelinks // include plugin-folder in the name.
$sublinks[$pid][] = array(
'link_id' => $row['page_id'],
'link_name' => $row['page_title'],
'link_url' => vartrue($row['page_sef'],'page.php?'.$row['page_id']),
// 'link_url' => vartrue($row['page_sef'],'page.php?id='.$row['page_id']),
'link_url' => 'page.php?id='.$row['page_id'],
// 'link_url' => e107::getUrl()->create('page/view', $row, 'allow=page_id,page_sef'), //XXX FIXME - bad links created.
'link_description' => '',
'link_button' => '',
'link_category' => '',
@@ -86,7 +88,10 @@ class page_sitelinks // include plugin-folder in the name.
$arr[] = array(
'link_id' => $row['chapter_id'],
'link_name' => $row['chapter_name'],
'link_url' => vartrue($row['chapter_sef'],'#'),
//TODO SEFURLS using chapter_sef.
'link_url' => ($row['chapter_parent'] == 0) ? 'page.php?bk='.$row['chapter_id'] : 'page.php?ch='.$row['chapter_id'],
// 'link_url' => vartrue($row['chapter_sef'],'#'),
'link_description' => '',
'link_button' => '',
'link_category' => '',