aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-03-17 00:33:43 -0700
committerfriendica <info@friendica.com>2015-03-17 00:33:43 -0700
commitfab8209ebd4a052f8af5918de8603fd21a4bc7a6 (patch)
tree80590f6645a623168f767f88e7cef6bc29e6b294
parent7af012b1f95fb329c9bf127a60e0a383d853e37d (diff)
downloadvolse-hubzilla-fab8209ebd4a052f8af5918de8603fd21a4bc7a6.tar.gz
volse-hubzilla-fab8209ebd4a052f8af5918de8603fd21a4bc7a6.tar.bz2
volse-hubzilla-fab8209ebd4a052f8af5918de8603fd21a4bc7a6.zip
turn photo location mapping into a feature
-rw-r--r--include/features.php1
-rw-r--r--include/photos.php2
2 files changed, 2 insertions, 1 deletions
diff --git a/include/features.php b/include/features.php
index fc14858a8..08b32fe19 100644
--- a/include/features.php
+++ b/include/features.php
@@ -44,6 +44,7 @@ function get_features() {
array('webpages', t('Web Pages'), t('Provide managed web pages on your channel'),false),
array('private_notes', t('Private Notes'), t('Enables a tool to store notes and reminders'),false),
array('nav_channel_select', t('Navigation Channel Select'), t('Change channels directly from within the navigation dropdown menu'),false),
+ array('photo_location', t('Photo Location'), t('Photo metadata is normally stripped. This extracts the location (if present) prior to stripping metadata and links it to a map.'),false),
//FIXME - needs a description, but how the hell do we explain this to normals?
diff --git a/include/photos.php b/include/photos.php
index 4785e47c4..4d3f4c755 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -208,7 +208,7 @@ function photo_upload($channel, $observer, $args) {
$lat = $lon = null;
if($exif && $exif['GPS']) {
- if(get_pconfig($channel_id,'system','allow_photo_location')) {
+ if(feature_enabled($channel_id,'photo_location')) {
$lat = getGps($exif['GPS']['GPSLatitude'], $exif['GPSLatitudeRef']);
$lon = getGps($exif['GPS']['GPSLongitude'], $exif['GPSLongitudeRef']);
}