From 4aa75a7d17d70942d1150721ef9ccfd4ccf133b0 Mon Sep 17 00:00:00 2001
From: Ryan Cramer <ryan@processwire.com>
Date: Sun, 11 Sep 2022 10:12:17 -0400
Subject: [PATCH] Update LanguageSupportPageNames module to support fallback to
 default pagination prefix 'page' when in the admin. This is to resolve an
 issue in Lister when the default language pagination prefix has been
 overridden.

---
 .../LanguageSupport/LanguageSupportPageNames.module        | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/wire/modules/LanguageSupport/LanguageSupportPageNames.module b/wire/modules/LanguageSupport/LanguageSupportPageNames.module
index 396bbcf0..546e2a20 100644
--- a/wire/modules/LanguageSupport/LanguageSupportPageNames.module
+++ b/wire/modules/LanguageSupport/LanguageSupportPageNames.module
@@ -135,6 +135,13 @@ class LanguageSupportPageNames extends WireData implements Module, ConfigurableM
 		if(count($pageNumUrlPrefixes)) {
 			if(empty($pageNumUrlPrefixes['default'])) {
 				$pageNumUrlPrefixes['default'] = $config->pageNumUrlPrefix; // original/fallback prefix
+			} else if(!in_array($config->pageNumUrlPrefix, $pageNumUrlPrefixes)) {
+				// if default prefix is also overridden then add it as an extra one allowed in admin
+				$url = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '';
+				if($url && strpos($url, $config->urls->admin) === 0) {
+					$key = 0; // PagesPathFinder maps non-string language names to default language
+					$pageNumUrlPrefixes[$key] = $config->pageNumUrlPrefix; // original prefix
+				}
 			}
 			$config->set('pageNumUrlPrefixes', $pageNumUrlPrefixes);
 		}