← Back to branch summary

~ubuntu-branches/ubuntu/vivid/phpmyadmin/vivid

« back to all changes in this revision

Viewing changes to libraries/dbi/DBIMysqli.class.php

  • Committer: Package Import Robot
  • Author(s): Michal Čihař
  • Date: 2014-08-11 11:14:26 UTC
  • mfrom: (1.2.61)
  • Revision ID: package-import@ubuntu.com-20140811111426-uimdbe8nyzrvpddo
Tags: 4:4.2.7-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libraries/dbi/DBIMysqli.class.php
135
135
 
136
136
        if ($server) {
137
137
            $server_port   = (empty($server['port']))
138
 
                ? false
 
138
                ? null
139
139
                : (int)$server['port'];
140
140
            $server_socket = (empty($server['socket']))
141
141
                ? ''
145
145
                : $server['host'];
146
146
        } else {
147
147
            $server_port   = (empty($cfg['Server']['port']))
148
 
                ? false
 
148
                ? null
149
149
                : (int) $cfg['Server']['port'];
150
150
            $server_socket = (empty($cfg['Server']['socket']))
151
151
                ? null