aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/exif.php5
-rw-r--r--system.php5
2 files changed, 10 insertions, 0 deletions
diff --git a/lib/exif.php b/lib/exif.php
index 2bc25c996..5343044ea 100644
--- a/lib/exif.php
+++ b/lib/exif.php
@@ -1,6 +1,11 @@
<?php
function td_get_exif($file) {
+
+ // catch for those who don't have exif module loaded
+ if (!is_callable('exif_read_data'))
+ return;
+
$mime = $file->mimetype;
if ($mime != 'image/jpeg' && $mime != 'image/pjpeg')
return;
diff --git a/system.php b/system.php
index 549c51de4..85397fc08 100644
--- a/system.php
+++ b/system.php
@@ -118,6 +118,11 @@
<td><?php echo (is_callable('imagegif')) ? 'Enabled' : 'Disabled'; ?></td>
<td></td>
</tr>
+ <tr>
+ <td>EXIF</td>
+ <td><?php echo (is_callable('exif_read_data')) ? 'Enabled' : 'Disabled'; ?></td>
+ <td></td>
+ </tr>
</table>
<div style="margin-top:20px;">
<a href="<?php echo $CONFIG->url . "mod/tidypics/docs/configure_server.txt"; ?>">Server configuration doc</a>