diff options
author | Sem <sembrestels@riseup.net> | 2012-07-29 04:49:57 +0200 |
---|---|---|
committer | Sem <sembrestels@riseup.net> | 2012-07-29 04:49:57 +0200 |
commit | f900e1e3cd0384aade0594ceffb6e4f51ce71415 (patch) | |
tree | 058fb6fd76c0aa865f1d08013c196b693cc205ba /views/default/forms | |
parent | e4c742e5ce21ae857ad28e0ec24fbe6e267adfaa (diff) | |
parent | 3cc5e98299630bf2acae83ec964343309d16392e (diff) | |
download | elgg-f900e1e3cd0384aade0594ceffb6e4f51ce71415.tar.gz elgg-f900e1e3cd0384aade0594ceffb6e4f51ce71415.tar.bz2 |
Merge branch 'no-watermark' of git://github.com/sembrestels/Tidypics
Diffstat (limited to 'views/default/forms')
-rw-r--r-- | views/default/forms/photos/admin/settings/main.php | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/views/default/forms/photos/admin/settings/main.php b/views/default/forms/photos/admin/settings/main.php index 5bdd8f586..a35c9ab59 100644 --- a/views/default/forms/photos/admin/settings/main.php +++ b/views/default/forms/photos/admin/settings/main.php @@ -26,14 +26,6 @@ echo elgg_view('input/text', array( )); echo '</div>'; -// Watermark Text -echo '<div>' . elgg_echo('tidypics:settings:watermark'); -echo elgg_view("input/text", array( - 'name' => 'params[watermark_text]', - 'value' => $plugin->watermark_text, -)); -echo '</div>'; - // Quota Size $quota = $plugin->quota; if (!$quota) { |