Merge commit '929ee56d' into before_upgrader

bt5/erp5_calendar/bt/template_keep_path_list

+portal_catalog/erp5_mysql_innodb/z_catalog_stock_list
\ No newline at end of file

bt5/erp5_sql_browser/SkinTemplateItem/portal_skins/erp5_sql_browser/ZMySQLDAConnection_viewQueryBrowser.html

@@ -35,6 +35,8 @@
     <script type="text/javascript" src="codemirror/addon/dialog/dialog.js"></script>
     <script type="text/javascript" src="codemirror/addon/search/searchcursor.js"></script>
     <script type="text/javascript" src="codemirror/addon/search/search.js"></script>
+    <script type="text/javascript" src="codemirror/addon/cm_edit/matchbrackets.js"></script>
+
     <link rel="stylesheet" href="codemirror/addon/hint/show-hint.css">
     <script src="codemirror/addon/hint/show-hint.js"></script>
     <script src="codemirror/addon/hint/anyword-hint.js"></script>
@@ -113,6 +115,7 @@
         $(function() {
           editor = CodeMirror.fromTextArea(document.getElementById("query"), {
             lineNumbers: true,
+            matchBrackets: true,
             viewportMargin: Infinity,
             extraKeys: {"Ctrl-Space": "autocomplete", "Ctrl-Enter": redraw, "Alt-Space": redraw},
             mode: "text/x-mariadb"