Skip to content

Commit 5b60836

Browse files
committed
Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x
2 parents ecb6314 + f180a4c commit 5b60836

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

main/install/update-files-1.10.0-1.11.0.inc.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@
4646

4747
// Some entities have been removed in 1.11. Delete the corresponding files
4848
$entitiesToRemove = [
49-
api_get_path(SYS_PATH).'src/CoreBundle/Entity/Groups.php',
50-
api_get_path(SYS_PATH).'src/CoreBundle/Entity/GroupRelGroup.php',
51-
api_get_path(SYS_PATH).'src/CoreBundle/Entity/GroupRelTag.php',
52-
api_get_path(SYS_PATH).'src/CoreBundle/Entity/GroupRelUser.php'
49+
api_get_path(SYS_PATH).'src/Chamilo/CoreBundle/Entity/Groups.php',
50+
api_get_path(SYS_PATH).'src/Chamilo/CoreBundle/Entity/GroupRelGroup.php',
51+
api_get_path(SYS_PATH).'src/Chamilo/CoreBundle/Entity/GroupRelTag.php',
52+
api_get_path(SYS_PATH).'src/Chamilo/CoreBundle/Entity/GroupRelUser.php'
5353
];
5454
foreach ($entitiesToRemove as $entity) {
5555
if (file_exists($entity)) {

src/Chamilo/CoreBundle/Component/Utils/ChamiloApi.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ public static function isAjaxRequest()
226226
public static function getLanguageVar($text, $prefix = '')
227227
{
228228
$text = api_replace_dangerous_char($text);
229-
$text = str_replace(['-', ' '], '_', $text);
229+
$text = str_replace(['-', ' ', '.'], '_', $text);
230230
$text = preg_replace('/\_{1,}/', '_', $text);
231231
//$text = str_replace('_', '', $text);
232232
$text = api_underscore_to_camel_case($text);

0 commit comments

Comments
 (0)