From b01718a0ae2b53c18c01f1374799a00a0c11279f Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Thu, 25 Feb 2016 05:13:02 -0500
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'

---
 interface/web/admin/form/server_ip.tform.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/interface/web/admin/form/server_ip.tform.php b/interface/web/admin/form/server_ip.tform.php
index 0dbdfe1..49a59de 100644
--- a/interface/web/admin/form/server_ip.tform.php
+++ b/interface/web/admin/form/server_ip.tform.php
@@ -121,7 +121,7 @@
 		'ip_address' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'TEXT',
-			'validators' => array (  0 => array ( 'type' => 'ISIP',
+			'validators' => array (  0 => array ( 'type' => 'CUSTOME', 'class' => 'validate_server', 'function' => 'check_server_ip',
 					'errmsg'=> 'ip_error_wrong'),
 				1 => array ( 'type' => 'UNIQUE',
 					'errmsg'=> 'ip_error_unique'),

--
Gitblit v1.9.1