From: Raphaël Barrois Date: Tue, 15 Oct 2013 21:08:33 +0000 (+0200) Subject: Backport fixes. X-Git-Tag: core/1.1.11~9 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=7196da2f6d88f876b8bd082497abe4c8170c65fd;p=platal.git Backport fixes. --- diff --git a/classes/csvimporter.php b/classes/csvimporter.php index 6acb2c7..dccdac3 100644 --- a/classes/csvimporter.php +++ b/classes/csvimporter.php @@ -31,7 +31,7 @@ class CSVImporter private $do_sql; private $index; - private $data = array(); + protected $data = array(); private $user_functions = array(); private $field_desc = array(); @@ -79,7 +79,7 @@ class CSVImporter return $value; } - private function makeAssoc($line, $relation) + protected function makeAssoc($line, $relation) { $ops = array(); foreach ($relation as $key=>$ref) { diff --git a/classes/xmlrpcclient.php b/classes/xmlrpcclient.php index deae598..05cc1e7 100644 --- a/classes/xmlrpcclient.php +++ b/classes/xmlrpcclient.php @@ -109,7 +109,9 @@ class XmlrpcClient } if (is_null($answer)) { Platal::page()->trigError("L'accès aux listes de diffusion n'est pas disponible actuellement."); - $this->bt->update(0, "Connection failed"); + if ($this->bt) { + $this->bt->update(0, "Connection failed"); + } return null; } Platal::assert(starts_with($answer, 'HTTP/1.0 200 OK'), "HTTP Error:\n" . $answer,