summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--albums.php7
-rw-r--r--lib/class/catalog.class.php2
2 files changed, 5 insertions, 4 deletions
diff --git a/albums.php b/albums.php
index 7970b73f..34eb2e67 100644
--- a/albums.php
+++ b/albums.php
@@ -42,10 +42,11 @@ switch ($_REQUEST['action']) {
}
$album = new Album($_REQUEST['album_id']);
+ $art = new Art($album->id,'album');
// Pull the image information
$data = array('file'=>$_FILES['file']['tmp_name']);
- $image_data = Art::get_from_source($data);
+ $image_data = $art->get_from_source($data);
// If we got something back insert it
if ($image_data) {
@@ -146,11 +147,11 @@ switch ($_REQUEST['action']) {
/* Check to see if we have the image url still */
$image_id = $_REQUEST['image'];
$album_id = $_REQUEST['album_id'];
+ $art = new Art($album_id,'album');
- $image = Art::get_from_source($_SESSION['form']['images'][$image_id]);
+ $image = $art->get_from_source($_SESSION['form']['images'][$image_id]);
$mime = $_SESSION['form']['images'][$image_id]['mime'];
- $art = new Art($album_id,'album');
$art->insert($image,$mime);
header("Location:" . Config::get('web_path') . "/albums.php?action=show&album=" . $art->uid);
diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php
index 38bc462e..9b3c8f6f 100644
--- a/lib/class/catalog.class.php
+++ b/lib/class/catalog.class.php
@@ -715,7 +715,7 @@ class Catalog extends database_object {
if (count($results)) {
// Pull the string representation from the source
- $image = Art::get_from_source($results['0']);
+ $image = $art->get_from_source($results['0']);
if (strlen($image) > '5') {
$art->insert($image,$results['0']['mime']);
// If they've enabled resizing of images generate the thumbnail now