Merge branch 'development'

nilsteampassnet · Oct 9, 2016 · d86fe68 · d86fe68
2 parents 9faef0a + 27d301e
commit d86fe68
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/changelog.md b/changelog.md
@@ -1,6 +1,7 @@
 Last changes
 
 2.1.26
+ #1537 Homepage not loading in French
  #1527 Error Field 'timestamp' doesn't have a default value
  #1526 New .htaccess file in ./includes/config
  #1525 Bad encoding in previous used passwords list

diff --git a/items.load.php b/items.load.php
@@ -2450,7 +2450,7 @@ function(data) {
                                 $("#div_editer_rep").dialog("close");
                             } else {
                                 if (data[0].error === "ERR_TITLE_ONLY_WITH_NUMBERS") {
-                                    $("#edit_rep_show_error").html('<?php echo $LANG['error_only_numbers_in_folder_name'];?>').show();
+                                    $("#edit_rep_show_error").html('<?php echo addslashes($LANG['error_only_numbers_in_folder_name']);?>').show();
                                 } else {
                                     $("#edit_rep_show_error").html(data[0].error).show();
                                 }