paths are off target

radicalsuz · Aug 14, 2009 · 1ad5ba3 · 1ad5ba3
1 parent 019f945
commit 1ad5ba3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/include/AMP/Form/Form.inc.php b/include/AMP/Form/Form.inc.php
@@ -803,7 +803,7 @@ function _addImageDisplay( $fieldname ){
     function &_addImageSelect( $name, $field_def ) {
         $valuefield_name = $name;
         $display_name = $this->_addImageDisplay( $name );
-        $picker = &$this->form->addElement(  'select', $valuefield_name, $field_def['label'], AMPSystem_Lookup::instance( 'images') );
+        $picker = &$this->form->addElement(  'select', $valuefield_name, $field_def['label'], AMP_lookup( 'images') );
 
         $srcpath = AMP_CONTENT_URL_IMAGES . AMP_IMAGE_CLASS_OPTIMIZED . DIRECTORY_SEPARATOR;
         $linkpath = AMP_SITE_URL . AMP_CONTENT_URL_IMAGES . AMP_IMAGE_CLASS_ORIGINAL. DIRECTORY_SEPARATOR;

diff --git a/include/AMP/System/File/Image.php b/include/AMP/System/File/Image.php
@@ -235,8 +235,9 @@ function delete( ){
         }
 
         $image_classes = AMP_lookup( 'image_classes');
-        foreach( $image_classes as $class ) {
+        foreach( $image_classes as $class => $class_desc ) {
             $path = AMP_image_path( $this->getName( ), $class );
+            # delete of current copy handled by parent class below
             if ( $path == $this->getPath( )) continue;
             if( file_exists( $path )) unlink( $path );
         }