From b34dc57f9eeb2449544f669b60b2a6490341be2c Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Tue, 2 Feb 2010 01:54:04 +0000
Subject: [PATCH] this uses the warehouse too

---
 core/extension.class.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/core/extension.class.php b/core/extension.class.php
index d67a7473..42763fca 100644
--- a/core/extension.class.php
+++ b/core/extension.class.php
@@ -129,11 +129,9 @@ abstract class DataHandlerExtension implements Extension {
 		if(is_null($this->theme)) $this->theme = get_theme_object($this);
 
 		if(($event instanceof DataUploadEvent) && $this->supported_ext($event->type) && $this->check_contents($event->tmpname)) {
-			$hash = $event->hash;
-			$ha = substr($hash, 0, 2);
 			if(!move_upload_to_archive($event)) return;
 			send_event(new ThumbnailGenerationEvent($event->hash, $event->type));
-			$image = $this->create_image_from_data("images/$ha/$hash", $event->metadata);
+			$image = $this->create_image_from_data(warehouse_path("images", $event->hash), $event->metadata);
 			if(is_null($image)) {
 				throw new UploadException("Data handler failed to create image object from data");
 			}