Remove stale preference.

horde · Feb 18, 2014 · f0a8b31 · f0a8b31
1 parent e6fe181
commit f0a8b31
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/ansel/config/prefs.php b/ansel/config/prefs.php
@@ -107,12 +107,6 @@
     'desc' => _("Show EXIF data")
 );
 
-$_prefs['watermark'] = array(
-    'value' => '',
-    'type' => 'text',
-    'desc' => _("Custom watermark to use for photos")
-);
-
 $_prefs['myansel_layout'] = array(
  'value' => 'a:1:{i:0;a:3:{i:0;a:4:{s:3:"app";s:5:"ansel";s:6:"height";i:1;s:5:"width";i:1;s:6:"params";a:2:{s:5:"type2";s:17:"ansel_Block_Cloud";s:6:"params";a:1:{s:5:"count";s:2:"20";}}}i:1;a:4:{s:3:"app";s:5:"ansel";s:6:"height";i:1;s:5:"width";i:1;s:6:"params";a:2:{s:5:"type2";s:23:"ansel_Block_MyGalleries";s:6:"params";a:1:{s:5:"limit";s:1:"0";}}}i:2;a:4:{s:3:"app";s:5:"ansel";s:6:"height";i:1;s:5:"width";i:1;s:6:"params";a:2:{s:5:"type2";s:25:"ansel_Block_RecentlyAdded";s:6:"params";a:2:{s:7:"gallery";s:3:"all";s:5:"limit";s:2:"10";}}}}}'
 );

diff --git a/ansel/lib/ActionHandler.php b/ansel/lib/ActionHandler.php
@@ -281,7 +281,7 @@ public static function editActions($actionID)
         $watermark_font = Horde_Util::getFormData('font');
         $watermark_halign = Horde_Util::getFormData('whalign');
         $watermark_valign = Horde_Util::getFormData('wvalign');
-        $watermark = Horde_Util::getFormData('watermark', $GLOBALS['prefs']->getValue('watermark'));
+        $watermark = Horde_Util::getFormData('watermark', $GLOBALS['prefs']->getValue('watermark_text'));
 
         // Get the gallery object and style information.
         try {
@@ -1047,4 +1047,4 @@ public static function galleryActions($actionID)
         return false;
     }
 
-}
+}