mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-19 04:41:53 +02:00
Code Issues Releases Wiki Activity

Fixes #850 - Gallery missing description when using simple brackets. Fixes #607 - embedded English text.

Browse Source
This commit is contained in:
Cameron
2015-02-01 17:27:05 -08:00
parent 2a4caa6cb7
commit 274069184f
4 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
e107_plugins/page/e_sitelink.php
View File

@@ -111,7 +111,8 @@ class page_sitelink // include plugin-folder in the name.
'link_order' => '',
'link_parent' => $row['chapter_parent'],
'link_open' => '',
'link_class' => 0
'link_class' => 0,
'link_identifier' => 'page-nav-'.intval($row['chapter_id']) // used for css id.
);
}
@@ -130,6 +131,8 @@ class page_sitelink // include plugin-folder in the name.
parse_str($parm,$options);
}
$sql = e107::getDb();
$sublinks = array();
$arr = array();
@@ -205,7 +208,9 @@ class page_sitelink // include plugin-folder in the name.
'link_parent' => $row['page_chapter'],
'link_open' => '',
'link_class' => intval($row['page_class']),
'link_active' => (isset($options['cpage']) && $row['page_id'] == $options['cpage'])
'link_active' => (isset($options['cpage']) && $row['page_id'] == $options['cpage']),
'link_identifier' => 'page-nav-'.intval($row['page_id']) // used for css id.
);
}
@@ -261,9 +266,11 @@ class page_sitelink // include plugin-folder in the name.
'link_class' => 0,
'link_sub' => (!vartrue($options['book']) && !vartrue($options['auto'])) ? varset($sublinks[$row['chapter_id']]) : '', //XXX always test with docs template in bootstrap before changing.
'link_active' => $row['chapter_parent'] == 0 ? isset($options['cbook']) && $options['cbook'] == $row['chapter_id'] : isset($options['cchapter']) && $options['cchapter'] == $row['chapter_id'],
'link_identifier' => 'page-nav-'.intval($row['chapter_id']) // used for css id.
);
}
$outArray = array();
$parent = vartrue($options['book']) ? intval($options['book']) : 0;