[SPIP] ~v3.0.17-->v3.0.19

[ptitvelo/web/www.git] / www / ecrire / req / pg.php

diff --git a/www/ecrire/req/pg.php b/www/ecrire/req/pg.php
index e4cad0e..1d62a8f 100644 (file)
--- a/www/ecrire/req/pg.php
+++ b/www/ecrire/req/pg.php
@@ -3,7 +3,7 @@
 /* *************************************************************************\
  *  SPIP, Systeme de publication pour l'internet                           *
  *                                                                         *
- *  Copyright (c) 2001-2012                                                *
+ *  Copyright (c) 2001-2014                                                *
  *  Arnaud Martin, Antoine Pitrou, Philippe Riviere, Emmanuel Saint-James  *
  *                                                                         *
  *  Ce programme est un logiciel libre distribue sous licence GNU/GPL.     *
@@ -43,15 +43,15 @@ function req_pg_dist($addr, $port, $login, $pass, $db='', $prefixe='') {
        if ($p >0) $port = " port=$p" ; else $port = '';
        $erreurs = array();
        if ($db) {
-               @$link = pg_connect("host=$host$port dbname=$db user=$login password=$pass", PGSQL_CONNECT_FORCE_NEW);
-       } elseif (!@$link = pg_connect("host=$host$port user=$login password=$pass", PGSQL_CONNECT_FORCE_NEW)) {
+               @$link = pg_connect("host=$host$port dbname=$db user=$login password='$pass'", PGSQL_CONNECT_FORCE_NEW);
+       } elseif (!@$link = pg_connect("host=$host$port user=$login password='$pass'", PGSQL_CONNECT_FORCE_NEW)) {
                        $erreurs[] = pg_last_error();
-           if (@$link = pg_connect("host=$host$port dbname=$login user=$login password=$pass", PGSQL_CONNECT_FORCE_NEW)) {
+           if (@$link = pg_connect("host=$host$port dbname=$login user=$login password='$pass'", PGSQL_CONNECT_FORCE_NEW)) {
              $db = $login;
            } else {
                    $erreurs[] = pg_last_error();
              $db = _DEFAULT_DB;
-             $link = pg_connect("host=$host$port dbname=$db user=$login password=$pass", PGSQL_CONNECT_FORCE_NEW);
+             $link = pg_connect("host=$host$port dbname=$db user=$login password='$pass'", PGSQL_CONNECT_FORCE_NEW);
            }
        }
        if (!$link) {
@@ -1035,7 +1035,7 @@ function spip_pg_cite($v, $t){
        if(is_null($v)) return 'NULL'; // null php se traduit en NULL SQL
 
        if (sql_test_date($t)) {
-               if (strpos("0123456789", $v[0]) === false)
+               if ($v AND (strpos("0123456789", $v[0]) === false))
                        return spip_pg_frommysql($v);
                else {
                        if (strncmp($v,'0000',4)==0)