From 400e762b1de59c6e6188243982263db255d44d10 Mon Sep 17 00:00:00 2001 From: Garvin Hicking Date: Thu, 6 Nov 2008 11:44:43 +0000 Subject: [PATCH] * Also recreate custom permalinks without using URL rewriting (garvinhicking) --- docs/NEWS | 3 +++ include/admin/configuration.inc.php | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/NEWS b/docs/NEWS index c20e6970..fafcb5ef 100644 --- a/docs/NEWS +++ b/docs/NEWS @@ -3,6 +3,9 @@ Version 1.4 () ------------------------------------------------------------------------ + * Also recreate custom permalinks without using URL rewriting + (garvinhicking) + * Fix WYSIWYG media insertion when being called on pages with multiple HTML portions/nuggets, and also the staticpage plugin (garvinhicking) diff --git a/include/admin/configuration.inc.php b/include/admin/configuration.inc.php index 29c97fe4..75bd2f4f 100644 --- a/include/admin/configuration.inc.php +++ b/include/admin/configuration.inc.php @@ -43,7 +43,6 @@ switch ($_POST['installAction'] && serendipity_checkFormToken()) { // Compare all old permalink section values against new one. A change in any of those // will force to update the .htaccess for rewrite rules. - if ($serendipity['rewrite'] != 'none') { $permconf = serendipity_parseTemplate(S9Y_CONFIG_TEMPLATE); if (is_array($permconf) && is_array($permconf['permalinks']['items'])) { foreach($permconf['permalinks']['items'] AS $permitem) { @@ -51,7 +50,7 @@ switch ($_POST['installAction'] && serendipity_checkFormToken()) { $permalinkNew[] = $serendipity[$permitem['var']]; } } - } + if (serendipity_checkPermission('siteConfiguration') && serialize($permalinkOld) != serialize($permalinkNew)) { printf(ATTEMPT_WRITE_FILE, $serendipity['serendipityPath'] . '.htaccess');