From: Chuck Scott <cscott@gaslightmedia.com>
Date: Mon, 11 May 2015 20:45:37 +0000 (-0400)
Subject: Last time, perhaps
X-Git-Tag: v1.0.0~20
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=15caaa5ca4b3b99e36c0f230831ebe6418fa385e;p=WP-Plugins%2Fglm-member-db.git

Last time, perhaps
---

diff --git a/classes/glmMemberImportFromConnections.php b/classes/glmMemberImportFromConnections.php
index 11558368..ec02eae7 100644
--- a/classes/glmMemberImportFromConnections.php
+++ b/classes/glmMemberImportFromConnections.php
@@ -569,15 +569,12 @@ class GlmMemberImportFromConnections
 
                 // If there's an entry in the $sizes array, it means that the image resized to this size
                 if (isset($sizes[$k])) {
-echo GLM_MEMBERS_PLUGIN_IMAGES_PATH.'/'.$sizes[$k]['file'].' => '.GLM_MEMBERS_PLUGIN_IMAGES_PATH.'/'.$k.'/'.$newFilename."<br>";
                     // Move resized file to desired direectory
                     rename(GLM_MEMBERS_PLUGIN_IMAGES_PATH.'/'.$sizes[$k]['file'], GLM_MEMBERS_PLUGIN_IMAGES_PATH.'/'.$k.'/'.$newFilename);
-
+                    unlink(GLM_MEMBERS_PLUGIN_IMAGES_PATH.'/'.$sizes[$k]['file']);
                 } else {
-echo GLM_MEMBERS_PLUGIN_IMAGES_PATH.'/'.$newFilename.' => '.GLM_MEMBERS_PLUGIN_IMAGES_PATH.'/'.$k.'/'.$newFilename."<br>";
                     // Image didn't resize to this size, probably because it was smaller than the destination size (silly WP Image Editor class) - so just use the original
                     copy(GLM_MEMBERS_PLUGIN_IMAGES_PATH.'/'.$newFilename, GLM_MEMBERS_PLUGIN_IMAGES_PATH.'/'.$k.'/'.$newFilename);
-
                 }
             }
 
diff --git a/lib/GlmDataAbstract/DataAbstract.php b/lib/GlmDataAbstract/DataAbstract.php
index e7eaf11b..94c357f7 100755
--- a/lib/GlmDataAbstract/DataAbstract.php
+++ b/lib/GlmDataAbstract/DataAbstract.php
@@ -2292,6 +2292,7 @@ abstract class GlmDataAbstract
             while (list($k, $v) = each($this->config['imageSizes'])) {
                 unlink(GLM_MEMBERS_PLUGIN_IMAGES_PATH.'/'.$k.'/'.$current_img);
             }
+            unlink(GLM_MEMBERS_PLUGIN_IMAGES_PATH.'/'.$current_img);
 
             $current_img = '';
 
@@ -2338,6 +2339,7 @@ abstract class GlmDataAbstract
 
                         // Move resized file to desired direectory
                         rename(GLM_MEMBERS_PLUGIN_IMAGES_PATH.'/'.$sizes[$k]['file'], GLM_MEMBERS_PLUGIN_IMAGES_PATH.'/'.$k.'/'.$newFilename);
+                        unlink(GLM_MEMBERS_PLUGIN_IMAGES_PATH.'/'.$sizes[$k]['file']);
 
                     } else {
 
@@ -2348,7 +2350,7 @@ abstract class GlmDataAbstract
                 }
 
                 // Remove original
-                unlink(GLM_MEMBERS_PLUGIN_IMAGES_PATH.'/'.$newFilename);
+//                unlink(GLM_MEMBERS_PLUGIN_IMAGES_PATH.'/'.$newFilename);
 
                 $current_img = $newFilename;