Mercurial > prosody-hg
changeset 14063:e73fdb09f080
Merge 13.0->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 09 Feb 2026 01:57:07 +0100 |
| parents | b0c31a5d8276 (current diff) ef586363d90f (diff) |
| children | 76ece4dd9782 |
| files | |
| diffstat | 1 files changed, 3 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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