Bug 1785985: remove prefix from db table before adding to ES queue

behatnotneeded

Change-Id: I860ebcc892361a7af6b2edeed2d9f7a9b4f42d86

htdocs/lib/dml.php

@@ -1103,9 +1103,6 @@ function get_table_from_query($sql) {
         $idsql = 'SELECT * FROM ' . $matches[2];
         $type = 'update';
     }
-    if (get_config('dbprefix')) {
-        $table = str_replace(get_config('dbprefix'), $table, '');
-    }
     return array($type, $table, $idsql, $bindoffset);
 }
 
@@ -1290,6 +1287,9 @@ function table_need_trigger($table) {
 }
 
 function pseudo_trigger($table, $data, $id, $savetype = 'insert') {
+    if ($dbprefix = get_config('dbprefix')) {
+        $table = preg_replace('/' . $dbprefix . '/', '', $table);
+    }
     if ($type = table_need_trigger($table)) {
         if ($type == 'es') {
             $artefacttype = ($table == 'artefact' && isset($data->artefacttype)) ? $data->artefacttype : null;

htdocs/search/elasticsearch/lib.php

@@ -2266,7 +2266,9 @@ class ElasticsearchIndexing {
      * Add to queue - a replacement for the triggers
      */
     public static function add_to_queue($id, $table, $artefacttype=null) {
-
+        if ($dbprefix = get_config('dbprefix')) {
+            $table = preg_replace('/' . $dbprefix . '/', '', $table);
+        }
         $artefacttypes_str = self::artefacttypes_filter_string();
         if ($table == 'view_artefact') {
             $sql = "INSERT INTO {search_elasticsearch_queue} (itemid, type, artefacttype)