From 30883c26bdceb9eaf32c8d4a1b0c1bce223b5226 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 17 Apr 2024 09:57:26 +0200
Subject: Adding upstream version 6.5+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 wp-admin/options-permalink.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'wp-admin/options-permalink.php')

diff --git a/wp-admin/options-permalink.php b/wp-admin/options-permalink.php
index 379dc8a..46da9be 100644
--- a/wp-admin/options-permalink.php
+++ b/wp-admin/options-permalink.php
@@ -154,7 +154,7 @@ if ( $iis7_permalinks ) {
 	} else {
 		$writable = false;
 	}
-} elseif ( $is_nginx ) {
+} elseif ( $is_nginx || $is_caddy ) {
 	$writable = false;
 } else {
 	if ( ( ! file_exists( $home_path . '.htaccess' )
@@ -190,7 +190,7 @@ if ( $structure_updated ) {
 					'<code>web.config</code>'
 				);
 			}
-		} elseif ( ! $is_nginx && $htaccess_update_required && ! $writable ) {
+		} elseif ( ! $is_nginx && ! $is_caddy && $htaccess_update_required && ! $writable ) {
 			$message = sprintf(
 				/* translators: %s: .htaccess */
 				__( 'You should update your %s file now.' ),
-- 
cgit v1.2.3