[MERGE] forward port branch 10.0 up to 36ba37a7a1

2019-03-18 10:20:06 +01:00
parent d5a8b238fa 36ba37a7a1
commit 5162ca7be7
7 changed files with 10 additions and 8 deletions
@@ -173,7 +173,7 @@ var QWeb2 = {
                        new_dict[as_first] = index === 0;
                        new_dict[as_last] = index + 1 === size;
                        new_dict[as_parity] = (index % 2 == 1 ? 'odd' : 'even');
-                        if (cur.constructor === Object) {
+                        if (cur && cur.constructor === Object) {
                            this.extend(new_dict, cur);
                        }
                        new_dict[as] = cur;