Fixed conflicts between versions of repeatedly inherited feature.

This commit is contained in:
Jocelyn Fiat
2017-11-07 15:54:20 +01:00
parent 6b2e256fa7
commit aa1443cb8f
15 changed files with 75 additions and 2 deletions

View File

@@ -13,6 +13,11 @@ class
inherit
CMS_HANDLER
WSF_EXECUTE_HANDLER
select
execute
end
WSF_URI_HANDLER
rename
execute as uri_execute,

View File

@@ -11,6 +11,11 @@ inherit
CMS_API_ACCESS
WSF_EXECUTE_HANDLER
select
execute
end
WSF_URI_HANDLER
rename
execute as uri_execute,

View File

@@ -11,6 +11,11 @@ class
inherit
CMS_HANDLER
WSF_EXECUTE_HANDLER
select
execute
end
WSF_URI_HANDLER
rename
execute as uri_execute,

View File

@@ -7,9 +7,13 @@ class
CMS_ADMIN_ROLES_HANDLER
inherit
CMS_HANDLER
WSF_EXECUTE_HANDLER
select
execute
end
WSF_URI_HANDLER
rename
execute as uri_execute,

View File

@@ -11,6 +11,11 @@ class
inherit
CMS_HANDLER
WSF_EXECUTE_HANDLER
select
execute
end
WSF_URI_HANDLER
rename
execute as uri_execute,

View File

@@ -11,6 +11,11 @@ class
inherit
CMS_HANDLER
WSF_EXECUTE_HANDLER
select
execute
end
WSF_URI_HANDLER
rename
execute as uri_execute,

View File

@@ -7,9 +7,13 @@ class
CMS_ADMIN_USERS_HANDLER
inherit
CMS_HANDLER
WSF_EXECUTE_HANDLER
select
execute
end
WSF_URI_HANDLER
rename
execute as uri_execute,

View File

@@ -10,6 +10,11 @@ class
inherit
CMS_BLOG_HANDLER
WSF_EXECUTE_HANDLER
select
execute
end
WSF_URI_HANDLER
rename
execute as uri_execute,

View File

@@ -13,6 +13,11 @@ class
inherit
CMS_NODE_HANDLER
WSF_EXECUTE_HANDLER
select
execute
end
WSF_URI_HANDLER
rename
execute as uri_execute,

View File

@@ -9,6 +9,11 @@ class
inherit
CMS_NODE_HANDLER
WSF_EXECUTE_HANDLER
select
execute
end
WSF_URI_HANDLER
rename
new_mapping as new_uri_mapping,

View File

@@ -15,6 +15,11 @@ inherit
module_api as taxonomy_api
end
WSF_EXECUTE_HANDLER
select
execute
end
WSF_URI_HANDLER
rename
execute as uri_execute,

View File

@@ -15,6 +15,11 @@ inherit
module_api as taxonomy_api
end
WSF_EXECUTE_HANDLER
select
execute
end
WSF_URI_HANDLER
rename
execute as uri_execute,

View File

@@ -16,6 +16,11 @@ inherit
module_api as taxonomy_api
end
WSF_EXECUTE_HANDLER
select
execute
end
WSF_URI_HANDLER
rename
execute as uri_execute,

View File

@@ -16,6 +16,11 @@ inherit
module_api as taxonomy_api
end
WSF_EXECUTE_HANDLER
select
execute
end
WSF_URI_HANDLER
rename
execute as uri_execute,

View File

@@ -11,6 +11,11 @@ class
inherit
CMS_HANDLER
WSF_EXECUTE_HANDLER
select
execute
end
WSF_URI_HANDLER
rename
execute as uri_execute,