Minor - Code style

pull/2487/head
Yannick Warnier 9 years ago
parent 3cf1fc4901
commit 6bbe303a26
  1. 4
      main/inc/lib/database.lib.php
  2. 13
      main/install/install.lib.php

@ -572,11 +572,11 @@ class Database
if (is_array($value_array)) {
$clean_values = array();
foreach ($value_array as $item) {
$item = Database::escape_string($item);
$item = self::escape_string($item);
$clean_values[]= $item;
}
} else {
$value_array = Database::escape_string($value_array);
$value_array = self::escape_string($value_array);
$clean_values = $value_array;
}

@ -3050,9 +3050,11 @@ function get_group_picture_path_by_id($id, $type = 'web', $preview = false, $ano
}
/**
* Control the different steps of the migration through a big switch
* @param string $fromVersion
* @param EntityManager $manager
* @param bool $processFiles
* @return bool Always returns true except if the process is broken
*/
function migrateSwitch($fromVersion, $manager, $processFiles = true)
{
@ -3068,17 +3070,26 @@ function migrateSwitch($fromVersion, $manager, $processFiles = true)
switch ($fromVersion) {
case '1.9.0':
//no break
case '1.9.2':
//no break
case '1.9.4':
//no break
case '1.9.6':
//no break
case '1.9.6.1':
//no break
case '1.9.8':
//no break
case '1.9.8.1':
//no break
case '1.9.8.2':
//no break
case '1.9.10':
//no break
case '1.9.10.2':
//no break
case '1.9.10.4':
$database = new Database();
$database->setManager($manager);

Loading…
Cancel
Save