summaryrefslogtreecommitdiff
path: root/modules_v3/GEDFact_assistant/_CENS
diff options
context:
space:
mode:
authorfisharebest <fisharebest@gmail.com>2011-09-07 15:03:23 +0000
committerfisharebest <fisharebest@gmail.com>2011-09-07 15:03:23 +0000
commit8451e77868a172fd8423effe4f769ca2b761e119 (patch)
tree43841271e2a6b9f5ff0734f4d44e04943a6fc18d /modules_v3/GEDFact_assistant/_CENS
parent504ebbca5d3b2192bea4cbc869fd6bdc25a67e32 (diff)
downloadwebtrees-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/GEDFact_assistant/_CENS')
-rw-r--r--modules_v3/GEDFact_assistant/_CENS/census_3_find.php2
-rw-r--r--modules_v3/GEDFact_assistant/_CENS/census_3_search_add.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/modules_v3/GEDFact_assistant/_CENS/census_3_find.php b/modules_v3/GEDFact_assistant/_CENS/census_3_find.php
index a5cf512cd4..90a617f6b5 100644
--- a/modules_v3/GEDFact_assistant/_CENS/census_3_find.php
+++ b/modules_v3/GEDFact_assistant/_CENS/census_3_find.php
@@ -303,7 +303,7 @@ if ($type == "fam") {
}
// Show media and hide the rest
-if ($type == "media" && $MULTI_MEDIA) {
+if ($type == 'media') {
echo "<div align=\"center\">";
echo "<form name=\"filtermedia\" method=\"get\" onsubmit=\"return checknames(this);\" action=\"find.php\">";
echo "<input type=\"hidden\" name=\"choose\" value=\"", $choose, "\" />";
diff --git a/modules_v3/GEDFact_assistant/_CENS/census_3_search_add.php b/modules_v3/GEDFact_assistant/_CENS/census_3_search_add.php
index 121607f589..2205dba8e2 100644
--- a/modules_v3/GEDFact_assistant/_CENS/census_3_search_add.php
+++ b/modules_v3/GEDFact_assistant/_CENS/census_3_search_add.php
@@ -1457,7 +1457,7 @@ require_once 'includes/functions/functions_charts.php';
function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1", $currpid, $censyear) {
global $HIDE_LIVE_PEOPLE, $SHOW_LIVING_NAMES, $ZOOM_BOXES, $LINK_ICONS, $SCRIPT_NAME;
- global $MULTI_MEDIA, $SHOW_HIGHLIGHT_IMAGES, $bwidth, $bheight, $PEDIGREE_FULL_DETAILS, $SHOW_PEDIGREE_PLACES;
+ global $SHOW_HIGHLIGHT_IMAGES, $bwidth, $bheight, $PEDIGREE_FULL_DETAILS, $SHOW_PEDIGREE_PLACES;
global $TEXT_DIRECTION, $DEFAULT_PEDIGREE_GENERATIONS, $OLD_PGENS, $talloffset, $PEDIGREE_LAYOUT, $MEDIA_DIRECTORY;
global $WT_IMAGES, $ABBREVIATE_CHART_LABELS, $USE_MEDIA_VIEWER;
global $chart_style, $box_width, $generations, $show_spouse, $show_full;