SeaCMS/pico
3
0
Fork 0
Code Issues Pull Requests Activity

Add $dropIndex parameter to Pico::getPageUrl() method

Browse Source 
This allows one to prevent Pico from removing the last "index" path component. Example use case: Pico's official admin plugin. We must distinguish between "content/sub.md" and "content/sub/index.md", otherwise it wouldn't be possible to edit both pages.
This commit is contained in:
Daniel Rudolf 2016-07-14 00:24:06 +02:00
parent 848e28b7e6
commit aa1bc077a7
No known key found for this signature in database
GPG Key ID: A061F02CD8DE4538
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Pico.php
View File

@ -1424,9 +1424,11 @@ class Pico
* @param string $page identifier of the page to link to * @param string $page identifier of the page to link to
* @param array|string $queryData either an array containing properties to * @param array|string $queryData either an array containing properties to
* create a URL-encoded query string from, or a already encoded string * create a URL-encoded query string from, or a already encoded string
* @param boolean $dropIndex when the last path component is "index",
* then passing TRUE (default) leads to removing this path component
* @return string URL * @return string URL
*/ */
public function getPageUrl($page, $queryData = null) public function getPageUrl($page, $queryData = null, $dropIndex = true)
{ {
if (is_array($queryData)) { if (is_array($queryData)) {
$queryData = http_build_query($queryData, '', '&'); $queryData = http_build_query($queryData, '', '&');
@ -1438,6 +1440,7 @@ class Pico
} }
// drop "index" // drop "index"
if ($dropIndex) {
if ($page === 'index') { if ($page === 'index') {
$page = ''; $page = '';
} elseif (($pagePathLength = strrpos($page, '/')) !== false) { } elseif (($pagePathLength = strrpos($page, '/')) !== false) {
@ -1445,6 +1448,7 @@ class Pico
$page = substr($page, 0, $pagePathLength); $page = substr($page, 0, $pagePathLength);
} }
} }
}
if (!empty($queryData)) { if (!empty($queryData)) {
$queryData = ($this->isUrlRewritingEnabled() || empty($page)) ? '?' . $queryData : '&' . $queryData; $queryData = ($this->isUrlRewritingEnabled() || empty($page)) ? '?' . $queryData : '&' . $queryData;