[Fmsystem-commits] [16856] more on vagrant

[sigurdne]

Revision: 16856
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16856
Author:   sigurdne
Date:     2017-06-08 14:48:14 -0400 (Thu, 08 Jun 2017)
Log Message:
-----------
more on vagrant

Modified Paths:
--------------
    trunk/phpgwapi/doc/Vagrantfile
    trunk/phpgwapi/inc/class.db_pdo.inc.php

Modified: trunk/phpgwapi/doc/Vagrantfile
===================================================================
--- trunk/phpgwapi/doc/Vagrantfile      2017-06-08 17:38:06 UTC (rev 16855)
+++ trunk/phpgwapi/doc/Vagrantfile      2017-06-08 18:48:14 UTC (rev 16856)
@@ -86,6 +86,7 @@
     sudo apt-get install -y libapache2-mod-php7.0 php7.0 php7.0-curl 
php7.0-intl php7.0-mysql php-xdebug php-apcu php7.0-dev php7.0-xmlrpc 
php7.0-xsl php7.0-sybase php7.0-pgsql php7.0-json php7.0-gd php-imagick 
php7.0-imap php7.0-soap php7.0-zip php7.0-mbstring php-pear libaio1 locales
     sudo apt-get install -y git
     sudo apt-get install -y less vim-tiny
+       sudo apt-get install -y subversion
     sudo apt-get install -y apg
     sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ 
`lsb_release -cs`-pgdg main" >> /etc/apt/sources.list.d/pgdg.list'
     wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - | sudo 
apt-key add -

Modified: trunk/phpgwapi/inc/class.db_pdo.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.db_pdo.inc.php     2017-06-08 17:38:06 UTC (rev 
16855)
+++ trunk/phpgwapi/inc/class.db_pdo.inc.php     2017-06-08 18:48:14 UTC (rev 
16856)
@@ -121,9 +121,10 @@
                        switch ( $this->Type )
                        {
                                case 'postgres':
+                                       $this->Port = $this->Port ? $this->Port 
: 5432;
                                        try
                                        {
-                                               $this->db = new 
PDO("pgsql:dbname={$this->Database};host={$this->Host}", $this->User, 
$this->Password, array(PDO::ATTR_PERSISTENT => $this->persistent));
+                                               $this->db = new 
PDO("pgsql:dbname={$this->Database};host={$this->Host};port={$this->Port}", 
$this->User, $this->Password, array(PDO::ATTR_PERSISTENT => $this->persistent));
                                        }
                                        catch(PDOException $e){}
                                        break;