[apisix] 18/18: fix: add change lost when handling merge conflict

[sp...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

spacewander pushed a commit to branch release/2.15
in repository https://gitbox.apache.org/repos/asf/apisix.git

commit ae71e11e35b2147778522e10b92ecfa976d15b99
Author: spacewander <sp...@gmail.com>
AuthorDate: Wed Nov 9 16:46:26 2022 +0800

    fix: add change lost when handling merge conflict
    
    Signed-off-by: spacewander <sp...@gmail.com>
---
 apisix/plugin.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apisix/plugin.lua b/apisix/plugin.lua
index 7224e3492..7408786cb 100644
--- a/apisix/plugin.lua
+++ b/apisix/plugin.lua
@@ -460,7 +460,8 @@ function _M.filter(ctx, conf, plugins, route_conf, phase)
         if not check_disable(plugin_conf) then
             if plugin_obj.run_policy == "prefer_route" and route_plugin_conf ~= nil then
                 local plugin_conf_in_route = route_plugin_conf[name]
-                if plugin_conf_in_route and not plugin_conf_in_route.disable then
+                local disable_in_route = check_disable(plugin_conf_in_route)
+                if plugin_conf_in_route and not disable_in_route then
                     goto continue
                 end
             end