# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1770598627 -3600
# Node ID e73fdb09f08079f11db20bfb237849b16dab0b7b
# Parent  b0c31a5d8276e23ed4a102a8318091fcb7c822bc# Parent  ef586363d90f12faff8fd8d4039b3abd148eea34
Merge 13.0->trunk

diff -r b0c31a5d8276 -r e73fdb09f080 loader.lua
--- a/loader.lua	Fri Jan 30 22:02:31 2026 +0100
+++ b/loader.lua	Mon Feb 09 01:57:07 2026 +0100
@@ -2,11 +2,9 @@
 -- transition period while we update all require calls.
 
 if (...) == "prosody.loader" then
-	if not package.path:find "prosody" then
-		-- For require"util.foo" also look in paths equivalent to "prosody.util.foo"
-		package.path = package.path:gsub("([^;]*)(?[^;]*)", "%1prosody/%2;%1%2");
-		package.cpath = package.cpath:gsub("([^;]*)(?[^;]*)", "%1prosody/%2;%1%2");
-	end
+	-- For require"util.foo" also look in paths equivalent to "prosody.util.foo"
+	package.path = package.path:gsub("([^;]*)(?[^;]*)", "%1prosody/%2;%1%2");
+	package.cpath = package.cpath:gsub("([^;]*)(?[^;]*)", "%1prosody/%2;%1%2");
 else
 	-- When requiring "prosody.x", also look for "x"
 	for i = #package.searchers, 1, -1 do