From fb4c582d3c1cae46845764f3a1b506f7451a4c24 Mon Sep 17 00:00:00 2001
From: Sascha Grossenbacher <saschagros@gmail.com>
Date: Thu, 7 Jul 2011 10:43:47 +0200
Subject: [PATCH] Issue #1211066 by Berdir: Fixed error when editing user
 relationships block.

---
 .../user_relationship_blocks.module                |    2 --
 user_relationships.admin.inc                       |   20 --------------------
 user_relationships.module                          |   20 ++++++++++++++++++++
 3 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/user_relationship_blocks/user_relationship_blocks.module b/user_relationship_blocks/user_relationship_blocks.module
index 6318851..654ac21 100644
--- a/user_relationship_blocks/user_relationship_blocks.module
+++ b/user_relationship_blocks/user_relationship_blocks.module
@@ -128,8 +128,6 @@ function user_relationship_blocks_block_configure($delta) {
     return;
   }
 
-  // need this file. it has the validator in it
-  include_once(drupal_get_path('module', 'user_relationships_ui') .'/user_relationships_ui.admin_actions.inc');
   //current block settings
   $settings = user_relationship_blocks_block_save($delta);
 
diff --git a/user_relationships.admin.inc b/user_relationships.admin.inc
index a031e34..262ab73 100644
--- a/user_relationships.admin.inc
+++ b/user_relationships.admin.inc
@@ -292,26 +292,6 @@ function user_relationships_admin_type_edit_validate($form, &$form_state) {
   }
 }
 
-/***
- * Generic settings validation.
- */
-function user_relationships_setting_validation($element, $validations) {
-  foreach ($validations as $validation => $info) {
-    $arguments = array($element['#value']);
-    if (isset($info['valid_options'])) {
-      $arguments[] = $info['valid_options'];
-    }
-
-    $valid = function_exists($validation) && call_user_func_array($validation, $arguments);
-    $valid = !$valid ? ($validation == 'is_positive' && is_numeric($arguments) && (int)$arguments > 0) : FALSE;
-    $valid = !$valid ? ($validation == 'is_non_negative' && is_numeric($arguments) && (int)$arguments > -1) : FALSE;
-
-    if (!$valid) {
-      form_set_error($element['#name'], $info['msg']);
-    }
-  }
-}
-
 /**
  * Process the relationship edit page form submission.
  */
diff --git a/user_relationships.module b/user_relationships.module
index 8d15e6d..16da51e 100644
--- a/user_relationships.module
+++ b/user_relationships.module
@@ -71,6 +71,26 @@ function user_relationships_menu() {
   return $items;
 }
 
+/***
+ * Generic settings validation.
+ */
+function user_relationships_setting_validation($element, $validations) {
+  foreach ($validations as $validation => $info) {
+    $arguments = array($element['#value']);
+    if (isset($info['valid_options'])) {
+      $arguments[] = $info['valid_options'];
+    }
+
+    $valid = function_exists($validation) && call_user_func_array($validation, $arguments);
+    $valid = !$valid ? ($validation == 'is_positive' && is_numeric($arguments) && (int)$arguments > 0) : FALSE;
+    $valid = !$valid ? ($validation == 'is_non_negative' && is_numeric($arguments) && (int)$arguments > -1) : FALSE;
+
+    if (!$valid) {
+      form_set_error($element['#name'], $info['msg']);
+    }
+  }
+}
+
 /**
  * Helper function to generate the main and count queries from a list of parameters and options
  */
-- 
1.7.5.4