Merge branch 'MDL-69746-Master' of https://github.com/tuanngocnguyen/moodle into...

diff --cc lib/adminlib.php
index eb7476a,59531c3..bfdd787
--- 1/lib/adminlib.php
--- 2/lib/adminlib.php
+++ b/lib/adminlib.php
@@@ -9129,9 -9069,9 +9129,9 @@@ function any_new_admin_settings($node) 
   * @param string $column name
   * @return bool success or fail
   */
- function db_should_replace($table, $column = ''): bool {
+ function db_should_replace($table, $column = '', $additionalskiptables = ''): bool {
  
 -    // TODO: this is horrible hack, we should do whitelisting and each plugin should be responsible for proper replacing...
 +    // TODO: this is horrible hack, we should have a hook and each plugin should be responsible for proper replacing...
      $skiptables = ['config', 'config_plugins', 'filter_config', 'sessions',
          'events_queue', 'repository_instance_config', 'block_instances', 'files'];