Changeset 696403

Timestamp:

04/12/2013 05:38:26 AM (13 years ago)

Author:

ti2m

Message:

add error message on failed zip extraction

File:

• edge-suite/trunk/includes/edge-suite-comp-builder.inc (modified) (3 diffs)

edge-suite/trunk/includes/edge-suite-comp-builder.inc

@@ -328 +328 @@
     $result = unzip($file, $destination);
     if (is_wp_error($result)) {
-      throw new Exception('Extraction of ' . $file . ' failed.');
+      throw new Exception('Extraction of ' . $file . ' failed: ' . $result->get_error_message());
     }
     // Add ignored files
@@ -677 +677 @@
     global $wp_filesystem;
     // TODO: Test.
-    $allowed_extensions = 'js,png,jpg,gif,svg,css';
+    $allowed_extensions = 'js,png,jpg,gif,svg,css,html';
     // Strip spaces.
     $allowed_extensions = str_replace(' ', '', $allowed_extensions);
@@ -684 +684 @@
     // Check if list is valid.
     if (!preg_match('/^([a-zA-Z0-9]{2,6}\|)*([a-zA-Z0-9]{2,6})$/', $allowed_extensions)) {
-      $allowed_extensions = 'js|png|jpg|gif|svg|css';
+      $allowed_extensions = 'js|png|jpg|gif|svg|css|html';
     }