Changeset 613609

Timestamp:

10/17/2012 02:02:37 PM (13 years ago)

Author:

ti2m

Message:

permission fix + additional file checks

Location:

edge-suite/trunk/includes

Files:

• edge-suite-comp-builder.inc (modified) (1 diff)
• edge-suite-general.php (modified) (1 diff)

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

@@ -401 +401 @@
   protected function alterMainEdgeJs() {
     $file = $this->mainEdgeJS;
+    // Do an extensive file / permission check as this seems to fail with many server configs.
+    if(!file_exists($file)){
+      throw new Exception('Main edge file ' . $file . ' does not exist.');
+    }
+
+    if(!is_readable($file)){
+      throw new Exception('Main edge file' . $file . ' exists but is not readable.');
+    }
+
     $content = file_get_contents($file);
+    if(!isset($content) || empty($content)){
+      throw new Exception('Main edge file ' . $file . ' does exist, cleared is_readable check, but can not be read.');
+    }
 
     $this->parseDimensions($content);

edge-suite/trunk/includes/edge-suite-general.php

@@ -82 +82 @@
     $filesystem = new WP_Filesystem_Direct(null);
 
+    // Set up default file/folder permissions (copied from WP_Filesystem()).
+    if ( ! defined('FS_CHMOD_DIR') )
+      define('FS_CHMOD_DIR', 0755 );
+    if ( ! defined('FS_CHMOD_FILE') )
+      define('FS_CHMOD_FILE', 0644 );
+
     $z = new ZipArchive();