mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-09-03 03:13:34 +02:00
Code Issues Releases Wiki Activity

Improved active-link detection for SEF URL index.

Browse Source 
Issue #2318 - external URL issue.
Issue #2292
Issue #1604
This commit is contained in:
Cameron
2017-02-28 09:55:35 -08:00
parent 9b6b41c353
commit 9d546ce5d0
3 changed files with 55 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
e107_handlers/sitelinks_class.php
View File

@@ -319,7 +319,7 @@ class sitelinks
{
$linkInfo['link_url'] = $tp->parseTemplate($linkInfo['link_url'], TRUE); // shortcode in URL support - dynamic urls for multilanguage.
}
elseif($linkInfo['link_url'][0] != '/')
elseif($linkInfo['link_url'][0] != '/' && strpos($linkInfo['link_url'],'http') !== 0)
{
$linkInfo['link_url'] = e_HTTP.ltrim($linkInfo['link_url'],'/');
}
@@ -1722,6 +1722,7 @@ i.e-cat_users-32{ background-position: -555px 0; width: 32px; height: 32px; }
public function isActive(&$data='', $removeOnly = false, $exactMatch = false)
{
if(empty($data)) return;
### experimental active match added to the URL (and removed after parsing)
### Example of main link: {e_BASE}some/url/#?match/string1^match/string2
@@ -1758,6 +1759,11 @@ i.e-cat_users-32{ background-position: -555px 0; width: 32px; height: 32px; }
$dbLink = str_replace("//","/",$dbLink); // precaution for e_HTTP inclusion above.
if(!empty($data['link_owner']) && !empty($data['link_sefurl']))
{
$dbLink = e107::url($data['link_owner'],$data['link_sefurl']);
}
if(E107_DBG_PATH)
{
// e107::getDebug()->log("db=".$dbLink."<br />url=".e_REQUEST_URI."<br /><br />");