From c101151616033d53587d1435881dae0fa45aeefa Mon Sep 17 00:00:00 2001
From: Andy Lindeman <andy@highgroove.com>
Date: Sat, 23 Apr 2011 12:04:12 -0400
Subject: Allow tags to be merged by renaming

* Fixes #1628
---
 modules/gallery/libraries/InPlaceEdit.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'modules/gallery/libraries')

diff --git a/modules/gallery/libraries/InPlaceEdit.php b/modules/gallery/libraries/InPlaceEdit.php
index 88c30494..739cbb61 100644
--- a/modules/gallery/libraries/InPlaceEdit.php
+++ b/modules/gallery/libraries/InPlaceEdit.php
@@ -56,8 +56,12 @@ class InPlaceEdit_Core {
   }
 
   public function validate() {
-    $post = Validation::factory($_POST)
-      ->add_callbacks("input", $this->callback);
+    $post = Validation::factory($_POST);
+
+    if (!empty($this->callback)) {
+      $post->add_callbacks("input", $this->callback);
+    }
+
     foreach ($this->rules as $rule) {
       $post->add_rules("input", $rule);
     }
-- 
cgit v1.2.3