mbirth/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

Prepare a patch for 1.2, as we have no branch for that yet

Browse Source
This commit is contained in:
Garvin Hicking
2006-11-08 20:20:49 +00:00
parent 7661964383
commit 890f09b716
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/functions_permalinks.inc.php
View File

@ -279,6 +279,8 @@ function &serendipity_permalinkPatterns($return = false) {
$PAT['PLUGIN'] = '@/(' . $serendipity['permalinkPluginPath'] . '|plugin)/(.*)@'; $PAT['PLUGIN'] = '@/(' . $serendipity['permalinkPluginPath'] . '|plugin)/(.*)@';
$PAT['SEARCH'] = '@/' . $serendipity['permalinkSearchPath'] . '/(.*)@'; $PAT['SEARCH'] = '@/' . $serendipity['permalinkSearchPath'] . '/(.*)@';
$PAT['COMMENTS'] = '@/' . $serendipity['permalinkCommentsPath'] . '/(.*)@'; $PAT['COMMENTS'] = '@/' . $serendipity['permalinkCommentsPath'] . '/(.*)@';
// PATCH FOR UPCOMING 1.2:
// $PAT['PERMALINK'] = '@(' . serendipity_makePermalinkRegex($serendipity['permalinkStructure'], 'entry') . ')/?@i';
$PAT['PERMALINK'] = '@' . serendipity_makePermalinkRegex($serendipity['permalinkStructure'], 'entry') . '@i'; $PAT['PERMALINK'] = '@' . serendipity_makePermalinkRegex($serendipity['permalinkStructure'], 'entry') . '@i';
$PAT['PERMALINK_CATEGORIES'] = '@' . serendipity_makePermalinkRegex($serendipity['permalinkCategoryStructure'], 'category') . '@i'; $PAT['PERMALINK_CATEGORIES'] = '@' . serendipity_makePermalinkRegex($serendipity['permalinkCategoryStructure'], 'category') . '@i';
$PAT['PERMALINK_FEEDCATEGORIES'] = '@' . serendipity_makePermalinkRegex($serendipity['permalinkFeedCategoryStructure'], 'category') . '@i'; $PAT['PERMALINK_FEEDCATEGORIES'] = '@' . serendipity_makePermalinkRegex($serendipity['permalinkFeedCategoryStructure'], 'category') . '@i';
@ -315,11 +317,15 @@ function serendipity_searchPermalink($struct, $url, $default, $type = 'entry') {
if (stristr($struct, '%id%') === FALSE) { if (stristr($struct, '%id%') === FALSE) {
$url = preg_replace('@^(' . preg_quote($serendipity['serendipityHTTPPath'], '@') . '(' . preg_quote($serendipity['indexFile'], '@') . ')?\??(url=)?/?)([^&?]+).*@', '\4', $url); $url = preg_replace('@^(' . preg_quote($serendipity['serendipityHTTPPath'], '@') . '(' . preg_quote($serendipity['indexFile'], '@') . ')?\??(url=)?/?)([^&?]+).*@', '\4', $url);
// If no entryid is submitted, we rely on a new DB call to fetch the permalink. // If no entryid is submitted, we rely on a new DB call to fetch the permalink.
$pq = "SELECT entry_id, data $pq = "SELECT entry_id, data
FROM {$serendipity['dbPrefix']}permalinks FROM {$serendipity['dbPrefix']}permalinks
WHERE permalink = '" . serendipity_db_escape_string($url) . "' WHERE (permalink = '" . serendipity_db_escape_string($url) . "'
"
// PATCH FOR 1.2:
// . "OR permalink = '" . serendipity_db_escape_string($default) . "'"
. "
)
AND type = '" . serendipity_db_escape_string($type) . "' AND type = '" . serendipity_db_escape_string($type) . "'
AND entry_id > 0 AND entry_id > 0
LIMIT 1"; LIMIT 1";