From: garvinhicking <garvinhicking>
Date: Sun, 31 Jul 2005 18:36:24 +0000 (+0000)
Subject: wrong forceNone detection.
X-Git-Tag: 0.9~261
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=1ee87404de0c92e56e2c4acb701380722b4d6d9f;p=s9y.git

wrong forceNone detection.
---

diff --git a/include/functions_permalinks.inc.php b/include/functions_permalinks.inc.php
index b2ed4f7..7645dfe 100644
--- a/include/functions_permalinks.inc.php
+++ b/include/functions_permalinks.inc.php
@@ -356,7 +356,7 @@ function serendipity_buildPermalinks() {
 /* Uses logic to figure out how the URI should look, based on current rewrite rule */
 function serendipity_rewriteURL($path, $key='baseURL', $forceNone = false) {
     global $serendipity;
-    return $serendipity[$key] . (($serendipity['rewrite'] == 'none' && !$forceNone) || ($serendipity['rewrite'] != 'none' && $forceNone) ? $serendipity['indexFile'] . '?/' : '') . $path;
+    return $serendipity[$key] . (($serendipity['rewrite'] == 'none') || ($serendipity['rewrite'] != 'none' && $forceNone) ? $serendipity['indexFile'] . '?/' : '') . $path;
 }
 
 function serendipity_makePermalink($format, $data, $type = 'entry') {