Revert "Blacklist core data directory for wml.load() - fixes #4302"

This reverts commit ddffc1a due to feedback from @shikadiqueen Instead see #4564
wesnoth · Nov 13, 2019 · 5fc6360 · 5fc6360
1 parent ddffc1a
commit 5fc6360
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 4 deletions.
diff --git a/changelog.md b/changelog.md
@@ -43,7 +43,6 @@
    * New read-write keys in unit userdata: ellipse, halo, description, renamable
    * New functions for working with WML: wml.merge, wml.diff, wml.patch
    * wesnoth.wml_matches_filter renamed to wml.matches_filter (the old name still works)
-   * wml.load() will no longer load files from the core data directory
  ### WML engine
    * Support upkeep in StandardUnitFilter
    * [effect]apply_to=variation now supports heal_full

diff --git a/src/scripting/lua_kernel_base.cpp b/src/scripting/lua_kernel_base.cpp
@@ -453,9 +453,6 @@ static int intf_wml_tostring(lua_State* L) {
 static int intf_load_wml(lua_State* L)
 {
 	std::string file = luaL_checkstring(L, 1);
-	if(file.empty() || file[0] != '~') {
-		return luaL_argerror(L, 1, "security error: only userdata WML files may be loaded from Lua");
-	}
 	bool preprocess = true;
 	preproc_map defines_map;
 	if(lua_type(L, 2) == LUA_TBOOLEAN) {