Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

libraries/relation.lib.php

@@ -345,7 +345,7 @@ function PMA_printDiagMessageForParameter($parameter,
     echo '<tr><th class="left">';
     echo '$cfg[\'Servers\'][$i][\'' . $parameter . '\']  ... ';
     echo '</th><td class="right">';
-    if ($GLOBALS['cfgRelation'][$relation_parameter]) {
+    if ($relation_parameter_set) {
         echo $messages['ok'];
     } else {
         printf($messages['error'], $doc_anchor);

test/classes/gis/PMA_GIS_Factory_test.php

@@ -21,6 +21,8 @@ require_once 'libraries/gis/pma_gis_factory.php';
 
 /**
  * Test class for PMA_GIS_Factory
+ *
+ * @package PhpMyAdmin-test
  */
 class PMA_GIS_FactoryTest extends PHPUnit_Framework_TestCase
 {

test/classes/gis/PMA_GIS_Geom_test.php

@@ -10,6 +10,8 @@ require_once 'libraries/gis/pma_gis_geometry.php';
 
 /**
  * Abstract parent class for all PMA_GIS_<Geom_type> test classes
+ *
+ * @package PhpMyAdmin-test
  */
 abstract class PMA_GIS_GeomTest extends PHPUnit_Framework_TestCase
 {

test/classes/gis/PMA_GIS_Geometry_test.php

@@ -10,6 +10,8 @@ require_once 'libraries/gis/pma_gis_geometry.php';
 
 /**
  * Tests for PMA_GIS_Geometry class
+ *
+ * @package PhpMyAdmin-test
  */
 class PMA_GIS_GeometryTest extends PHPUnit_Framework_TestCase
 {

test/classes/gis/PMA_GIS_Linestring_test.php

@@ -12,6 +12,8 @@ require_once 'libraries/gis/pma_gis_linestring.php';
 
 /**
  * Tests for PMA_GIS_Linestring class
+ *
+ * @package PhpMyAdmin-test
  */
 class PMA_GIS_LinestringTest extends PMA_GIS_GeomTest
 {

test/classes/gis/PMA_GIS_Multilinestring_test.php

@@ -12,6 +12,8 @@ require_once 'libraries/gis/pma_gis_multilinestring.php';
 
 /**
  * Tests for PMA_GIS_Multilinestring class
+ *
+ * @package PhpMyAdmin-test
  */
 class PMA_GIS_MultilinestringTest extends PMA_GIS_GeomTest
 {

test/classes/gis/PMA_GIS_Multipoint_test.php

@@ -12,6 +12,8 @@ require_once 'libraries/gis/pma_gis_multipoint.php';
 
 /**
  * Tests for PMA_GIS_Multipoint class
+ *
+ * @package PhpMyAdmin-test
  */
 class PMA_GIS_MultipointTest extends PMA_GIS_GeomTest
 {

test/classes/gis/PMA_GIS_Multipolygon_test.php

@@ -12,6 +12,8 @@ require_once 'libraries/gis/pma_gis_multipolygon.php';
 
 /**
  * Tests for PMA_GIS_Multipolygon class
+ *
+ * @package PhpMyAdmin-test
  */
 class PMA_GIS_MultipolygonTest extends PMA_GIS_GeomTest
 {

test/classes/gis/PMA_GIS_Point_test.php

@@ -12,6 +12,8 @@ require_once 'libraries/gis/pma_gis_point.php';
 
 /**
  * Tests for PMA_GIS_Point class.
+ *
+ * @package PhpMyAdmin-test
  */
 class PMA_GIS_PointTest extends PMA_GIS_GeomTest
 {

test/classes/gis/PMA_GIS_Polygon_test.php

@@ -12,6 +12,8 @@ require_once 'libraries/gis/pma_gis_polygon.php';
 
 /**
  * Tests for PMA_GIS_Polygon class
+ *
+ * @package PhpMyAdmin-test
  */
 class PMA_GIS_PolygonTest extends PMA_GIS_GeomTest
 {