0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
This reverts commit ddffc1a4fd due to feedback from @shikadiqueen
Instead see #4564
This commit is contained in:
Celtic Minstrel 2019-11-12 23:27:36 -05:00
parent ddffc1a4fd
commit 5fc6360488
2 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.md
View file

@ -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

3
src/scripting/lua_kernel_base.cpp
View file

@ -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) {