diff options
| author | fisharebest <fisharebest@gmail.com> | 2011-09-07 15:03:23 +0000 |
|---|---|---|
| committer | fisharebest <fisharebest@gmail.com> | 2011-09-07 15:03:23 +0000 |
| commit | 8451e77868a172fd8423effe4f769ca2b761e119 (patch) | |
| tree | 43841271e2a6b9f5ff0734f4d44e04943a6fc18d /modules_v3/googlemap | |
| parent | 504ebbca5d3b2192bea4cbc869fd6bdc25a67e32 (diff) | |
| download | webtrees-8451e77868a172fd8423effe4f769ca2b761e119.tar.gz webtrees-8451e77868a172fd8423effe4f769ca2b761e119.tar.bz2 webtrees-8451e77868a172fd8423effe4f769ca2b761e119.zip | |
Remove the "enable multimedia" option. Multimedia is always enabled. Add a new configuration option to restrict who can upload new media files.
Diffstat (limited to 'modules_v3/googlemap')
| -rw-r--r-- | modules_v3/googlemap/pedigree_map.php | 2 | ||||
| -rw-r--r-- | modules_v3/googlemap/wt_v3_googlemap.js.php | 6 | ||||
| -rw-r--r-- | modules_v3/googlemap/wt_v3_pedigree_map.js.php | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/modules_v3/googlemap/pedigree_map.php b/modules_v3/googlemap/pedigree_map.php index 0b5a49448d..6bb080f4b8 100644 --- a/modules_v3/googlemap/pedigree_map.php +++ b/modules_v3/googlemap/pedigree_map.php @@ -35,7 +35,7 @@ if (!defined('WT_WEBTREES')) { require WT_ROOT.WT_MODULES_DIR.'googlemap/defaultconfig.php'; -global $PEDIGREE_GENERATIONS, $MAX_PEDIGREE_GENERATIONS, $ENABLE_AUTOCOMPLETE, $MULTI_MEDIA, $SHOW_HIGHLIGHT_IMAGES, $WT_IMAGES; +global $PEDIGREE_GENERATIONS, $MAX_PEDIGREE_GENERATIONS, $ENABLE_AUTOCOMPLETE, $SHOW_HIGHLIGHT_IMAGES, $WT_IMAGES; // Default is show for both of these. $hideflags = safe_GET('hideflags'); diff --git a/modules_v3/googlemap/wt_v3_googlemap.js.php b/modules_v3/googlemap/wt_v3_googlemap.js.php index 76fb6d31db..aff3fbcc42 100644 --- a/modules_v3/googlemap/wt_v3_googlemap.js.php +++ b/modules_v3/googlemap/wt_v3_googlemap.js.php @@ -410,7 +410,7 @@ $STREETVIEW=get_module_setting('googlemap', 'GM_USE_STREETVIEW'); function loadMap() { <?php - global $GOOGLEMAP_MAP_TYPE, $PEDIGREE_GENERATIONS, $MAX_PEDIGREE_GENERATIONS, $ENABLE_AUTOCOMPLETE, $MULTI_MEDIA, $SHOW_HIGHLIGHT_IMAGES, $WT_IMAGES, $GEDCOM; + global $GOOGLEMAP_MAP_TYPE, $PEDIGREE_GENERATIONS, $MAX_PEDIGREE_GENERATIONS, $ENABLE_AUTOCOMPLETE, $SHOW_HIGHLIGHT_IMAGES, $WT_IMAGES, $GEDCOM; ?> // Create the map and mapOptions @@ -481,7 +481,7 @@ $STREETVIEW=get_module_setting('googlemap', 'GM_USE_STREETVIEW'); } else { $indirec = $this_person->getGedcomRecord(); $image = ''; - if ($MULTI_MEDIA && $SHOW_HIGHLIGHT_IMAGES) { + if ($SHOW_HIGHLIGHT_IMAGES) { if (!empty($pid)) { $object = find_highlighted_object($pid, WT_GED_ID, $indirec); } @@ -500,7 +500,7 @@ $STREETVIEW=get_module_setting('googlemap', 'GM_USE_STREETVIEW'); if (!empty($person)) { $indirec2 = $person->getGedcomRecord(); $image2 = ''; - if ($MULTI_MEDIA && $SHOW_HIGHLIGHT_IMAGES) { + if ($SHOW_HIGHLIGHT_IMAGES) { if (!empty($gmark['name'])) { $object2 = find_highlighted_object($gmark['name'], WT_GED_ID, $indirec2); } diff --git a/modules_v3/googlemap/wt_v3_pedigree_map.js.php b/modules_v3/googlemap/wt_v3_pedigree_map.js.php index ae85f1b645..7df46ab3c4 100644 --- a/modules_v3/googlemap/wt_v3_pedigree_map.js.php +++ b/modules_v3/googlemap/wt_v3_pedigree_map.js.php @@ -477,7 +477,7 @@ for ($i=0; $i<($controller->treesize); $i++) { // add thumbnail image $image = ''; - if ($MULTI_MEDIA && $SHOW_HIGHLIGHT_IMAGES) { + if ($SHOW_HIGHLIGHT_IMAGES) { $object = find_highlighted_object($pid, WT_GED_ID, $indirec); if (!empty($object)) { $mediaobject=WT_Media::getInstance($object['mid']); |