Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x

pull/2458/head
Angel Fernando Quiroz Campos 8 years ago
commit 5b60836cef
  1. 8
      main/install/update-files-1.10.0-1.11.0.inc.php
  2. 2
      src/Chamilo/CoreBundle/Component/Utils/ChamiloApi.php

@ -46,10 +46,10 @@ if (defined('SYSTEM_INSTALLATION')) {
// Some entities have been removed in 1.11. Delete the corresponding files
$entitiesToRemove = [
api_get_path(SYS_PATH).'src/CoreBundle/Entity/Groups.php',
api_get_path(SYS_PATH).'src/CoreBundle/Entity/GroupRelGroup.php',
api_get_path(SYS_PATH).'src/CoreBundle/Entity/GroupRelTag.php',
api_get_path(SYS_PATH).'src/CoreBundle/Entity/GroupRelUser.php'
api_get_path(SYS_PATH).'src/Chamilo/CoreBundle/Entity/Groups.php',
api_get_path(SYS_PATH).'src/Chamilo/CoreBundle/Entity/GroupRelGroup.php',
api_get_path(SYS_PATH).'src/Chamilo/CoreBundle/Entity/GroupRelTag.php',
api_get_path(SYS_PATH).'src/Chamilo/CoreBundle/Entity/GroupRelUser.php'
];
foreach ($entitiesToRemove as $entity) {
if (file_exists($entity)) {

@ -226,7 +226,7 @@ class ChamiloApi
public static function getLanguageVar($text, $prefix = '')
{
$text = api_replace_dangerous_char($text);
$text = str_replace(['-', ' '], '_', $text);
$text = str_replace(['-', ' ', '.'], '_', $text);
$text = preg_replace('/\_{1,}/', '_', $text);
//$text = str_replace('_', '', $text);
$text = api_underscore_to_camel_case($text);

Loading…
Cancel
Save