[packages/phpMyAdmin.git] / phpMyAdmin-ServerSelectDisplayName.patch

*** libraries/select_server.lib.php.org	Tue Aug 19 00:41:59 2008
--- libraries/select_server.lib.php	Tue Aug 19 00:42:35 2008
***************
*** 62,68 ****
          if (!empty($server['verbose'])) {
              $label = $server['verbose'];
          } else {
!             $label = $server['host'];
              if (!empty($server['port'])) {
                  $label .= ':' . $server['port'];
              }
--- 62,68 ----
          if (!empty($server['verbose'])) {
              $label = $server['verbose'];
          } else {
!             $label = isset($server['display']) ? $server['display'] : $server['host'];
              if (!empty($server['port'])) {
                  $label .= ':' . $server['port'];
              }
Commit	Line	Data
aae97293	1	*** libraries/select_server.lib.php.org Tue Aug 19 00:41:59 2008
	2	--- libraries/select_server.lib.php Tue Aug 19 00:42:35 2008
	3	***************
	4	* 62,68 **
	5	if (!empty($server['verbose'])) {
	6	$label = $server['verbose'];
	7	} else {
	8	! $label = $server['host'];
	9	if (!empty($server['port'])) {
	10	$label .= ':' . $server['port'];
	11	}
	12	--- 62,68 ----
	13	if (!empty($server['verbose'])) {
	14	$label = $server['verbose'];
	15	} else {
	16	! $label = isset($server['display']) ? $server['display'] : $server['host'];
	17	if (!empty($server['port'])) {
	18	$label .= ':' . $server['port'];
	19	}