GLPI 10.0 (2022 version) is not using PDO

pluginsGLPI · May 5, 2022 · d1472bc · d1472bc
1 parent cbf2d6c
commit d1472bc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/inc/container.class.php b/inc/container.class.php
@@ -107,15 +107,13 @@ static function install(Migration $migration, $version) {
       }
 
       // Fix containers names that were generated prior to Fields 1.9.2.
-      $glpi_version = preg_replace('/^((\d+\.?)+).*$/', '$1', GLPI_VERSION);
       $bad_named_containers = $DB->request(
          [
             'FROM' => self::getTable(),
             'WHERE' => [
                'name' => [
                   'REGEXP',
-                  // Regex will be escaped by PDO in GLPI 10+, but has to be escaped for GLPI < 10
-                  version_compare($glpi_version, '10.0', '>=') ? '\d+' : $DB->escape('\d+')
+                  $DB->escape('\d+')
                ],
             ],
          ]

diff --git a/inc/toolbox.class.php b/inc/toolbox.class.php
@@ -96,15 +96,13 @@ private function replaceIntByLetters($str) {
    public function fixFieldsNames(Migration $migration, $condition) {
       global $DB;
 
-      $glpi_version = preg_replace('/^((\d+\.?)+).*$/', '$1', GLPI_VERSION);
       $bad_named_fields = $DB->request(
          [
             'FROM' => PluginFieldsField::getTable(),
             'WHERE' => [
                'name' => [
                   'REGEXP',
-                  // Regex will be escaped by PDO in GLPI 10+, but has to be escaped for GLPI < 10
-                  version_compare($glpi_version, '10.0', '>=') ? '[0-9]+' : $DB->escape('[0-9]+')
+                  $DB->escape('[0-9]+')
                ],
                $condition,
             ],