diff options
| author | Greg Roach <fisharebest@gmail.com> | 2015-01-21 01:25:16 +0000 |
|---|---|---|
| committer | Greg Roach <fisharebest@gmail.com> | 2015-01-21 01:25:16 +0000 |
| commit | 1cbc816e4ae8f71235de84e2cdb03dfeef8670fd (patch) | |
| tree | 803facde6824641ef8493f72b805a74f4f587479 | |
| parent | 944015b7f38c2bc9eb497fac895da116a4c2e76a (diff) | |
| download | webtrees-1cbc816e4ae8f71235de84e2cdb03dfeef8670fd.tar.gz webtrees-1cbc816e4ae8f71235de84e2cdb03dfeef8670fd.tar.bz2 webtrees-1cbc816e4ae8f71235de84e2cdb03dfeef8670fd.zip | |
Too many 'default:'
| -rw-r--r-- | mediafirewall.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mediafirewall.php b/mediafirewall.php index 57778778f9..7c3559fc91 100644 --- a/mediafirewall.php +++ b/mediafirewall.php @@ -182,7 +182,6 @@ function embedText($im, $text, $maxsize, $color, $font, $vpos, $hpos) { break; } break; - default: } // apply the text @@ -307,9 +306,9 @@ $usewatermark = false; // if this image supports watermarks and the watermark module is intalled... if ($type) { // if this is not a thumbnail, or WATERMARK_THUMB is true - if (($which === 'main') || $WATERMARK_THUMB) { + if (($which === 'main') || $WT_TREE->getPreference('WATERMARK_THUMB')) { // if the user’s priv’s justify it... - if (WT_USER_ACCESS_LEVEL > $SHOW_NO_WATERMARK) { + if (WT_USER_ACCESS_LEVEL > $WT_TREE->getPreference('SHOW_NO_WATERMARK')) { // add a watermark $usewatermark = true; } @@ -392,7 +391,7 @@ if ($generatewatermark) { $im = applyWatermark($im); // save the image, if preferences allow - if ($which === 'thumb' && $SAVE_WATERMARK_THUMB || $which === 'main' && $SAVE_WATERMARK_IMAGE) { + if ($which === 'thumb' && $WT_TREE->getPreference('SAVE_WATERMARK_THUMB') || $which === 'main' && $WT_TREE->getPreference('SAVE_WATERMARK_IMAGE')) { // make sure the folder exists WT_File::mkdir(dirname($watermarkfile)); // save the image |