Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

2017-05-15 13:54:25 +02:00
parent 03274c3776 a9b670fdf5
commit 771348720b
5 changed files with 51 additions and 34 deletions
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -1270,7 +1270,7 @@ define([
                feedback("NO_PROXIES");
            }

-            if (typeof(Array.isArray) !== 'function') {
+            if (!/CRYPTPAD_SHIM/.test(Array.isArray.toString())) {
                feedback("NO_ISARRAY");
            }