Merged branch official/master. Resolved merge conflicts introduced due to merging of Piotr and Martynas's branches

setup/validate.php

@@ -1,11 +1,9 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Validation callback.
  *
- * @package    phpMyAdmin-setup
- * @copyright  Copyright (c) 2008, Piotr Przybylski <piotrprz@gmail.com>
- * @license    http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
- * @version    $Id$
+ * @package phpMyAdmin-setup
  */
 
 /**
@@ -14,7 +12,7 @@
 require './lib/common.inc.php';
 
 $validators = array();
-require './setup/lib/validate.lib.php';
+require './libraries/config/validate.lib.php';
 
 header('Content-type: application/json');
 
@@ -24,7 +22,7 @@ if (!($values instanceof stdClass)) {
     die('Wrong data');
 }
 $values = (array)$values;
-$result = validate($vids, $values, true);
+$result = PMA_config_validate($vids, $values, true);
 if ($result === false) {
     $result = 'Wrong data or no validation for ' . $vids;
 }