Merge remote branch 'gallery3/master'

2 files changed, 2 insertions, 7 deletions

diff --git a/modules/digibug/controllers/digibug.php b/modules/digibug/controllers/digibug.php
index 3c2bb115..88d1ace0 100644
--- a/modules/digibug/controllers/digibug.php
+++ b/modules/digibug/controllers/digibug.php
@@ -95,16 +95,11 @@ class Digibug_Controller extends Controller {
 
     if (!TEST_MODE) {
       // Dump out the image
-      header("Content-Type: $proxy->item->mime_type");
+      header("Content-Type: {$proxy->item->mime_type}");
       Kohana::close_buffers(false);
       $fd = fopen($file, "rb");
       fpassthru($fd);
       fclose($fd);
-
-      // If the request was for the image and not the thumb, then delete the proxy.
-      if ($type == "full") {
-        $proxy->delete();
-      }
     }
 
     $this->_clean_expired();
diff --git a/modules/digibug/models/digibug_proxy.php b/modules/digibug/models/digibug_proxy.php
index 0ce21649..2bff6ddb 100644
--- a/modules/digibug/models/digibug_proxy.php
+++ b/modules/digibug/models/digibug_proxy.php
@@ -17,6 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class Digibug_Proxy_Model extends ORM {
+class Digibug_Proxy_Model_Core extends ORM {
   protected $belongs_to = array("item");
 }