aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
Diffstat (limited to 'admin')
-rw-r--r--admin/include/functions.php13
-rw-r--r--admin/picture_modify.php8
-rw-r--r--admin/themes/default/template/picture_modify.tpl12
3 files changed, 2 insertions, 31 deletions
diff --git a/admin/include/functions.php b/admin/include/functions.php
index 0669c8d6d..59e59e5c2 100644
--- a/admin/include/functions.php
+++ b/admin/include/functions.php
@@ -200,21 +200,12 @@ SELECT
$files = array();
$files[] = get_element_path($row);
- if (!empty($row['tn_ext']))
- {
- $files[] = get_thumbnail_path($row);
- }
-
- if (!empty($row['has_high']) and get_boolean($row['has_high']))
- {
- $files[] = get_high_path($row);
- }
-
+
if (!empty($row['representative_ext']))
{
$pi = pathinfo($row['path']);
$file_wo_ext = get_filename_wo_extension($pi['basename']);
- $files[] = PHPWG_ROOT_PATH.$pi['dirname'].'/pwg_representative/'.$file_wo_ext.'.'.$row['representative_ext'];
+ $files[] = original_to_representative( $files[0], $row['representative_ext']);
}
$ok = true;
diff --git a/admin/picture_modify.php b/admin/picture_modify.php
index a4bde5179..3f4cda248 100644
--- a/admin/picture_modify.php
+++ b/admin/picture_modify.php
@@ -303,14 +303,6 @@ $template->assign(
)
);
-if ($row['has_high'] == 'true')
-{
- $template->assign(array(
- 'HIGH_FILESIZE' => isset($row['high_filesize']) ? $row['high_filesize'].' KB' : l10n('unknown'),
- 'HIGH_DIMENSIONS' => isset($row['high_width']) ? $row['high_width'].' * '.$row['high_height'] : l10n('unknown'),
- ));
-}
-
// image level options
$selected_level = isset($_POST['level']) ? $_POST['level'] : $row['level'];
$template->assign(
diff --git a/admin/themes/default/template/picture_modify.tpl b/admin/themes/default/template/picture_modify.tpl
index 943c11253..cddd1ba78 100644
--- a/admin/themes/default/template/picture_modify.tpl
+++ b/admin/themes/default/template/picture_modify.tpl
@@ -66,18 +66,6 @@ pwg_initialization_datepicker("#date_creation_day", "#date_creation_month", "#da
<td>{$FILESIZE}</td>
</tr>
-{if isset($HIGH_FILESIZE) }
- <tr>
- <td><strong>{'High dimensions'|@translate}</strong></td>
- <td>{$HIGH_DIMENSIONS}</td>
- </tr>
-
- <tr>
- <td><strong>{'High filesize'|@translate}</strong></td>
- <td>{$HIGH_FILESIZE}</td>
- </tr>
-{/if}
-
<tr>
<td><strong>{'Storage album'|@translate}</strong></td>
<td>{$STORAGE_CATEGORY}</td>