Merge branch 'xorg/maint' into xorg/master

diff --git a/ChangeLog b/ChangeLog
index e490c72..fa78f7b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
 ================================================================================
+VERSION 1.1.6                                                         XX XX XXXX
+
+From 1.1.5 branch:
+
+    * Search:
+        - #1622: Fixes address search                                      -JAC
+
+================================================================================
 VERSION 1.1.5                                                         31 05 2012
 
 Bug/Wish:

diff --git a/classes/profile.php b/classes/profile.php
index b11e31d..593568c 100644 (file)
--- a/classes/profile.php
+++ b/classes/profile.php
@@ -171,6 +171,13 @@ class Profile implements PlExportable
         $this->visibility = $visibility;
     }
 
+    public function __destruct()
+    {
+        // Need to delete objects allocated by the profile
+        // http://www.php.net/manual/en/function.unset.php#98692
+        unset($this->owner);
+    }
+
     public function id()
     {
         return $this->pid;

diff --git a/core b/core
index df1ec68..e617a93 160000 (submodule)
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit df1ec683f930734d7532bd3dc3b10c46da947748
+Subproject commit e617a9308d1b8523fe76e8ae274b2eb5dee325a9

diff --git a/modules/payment.php b/modules/payment.php
index 623aad2..a8fd9ed 100644 (file)
--- a/modules/payment.php
+++ b/modules/payment.php
@@ -20,17 +20,19 @@
  ***************************************************************************/
 
 /* sort en affichant une erreur */
-function cb_erreur($text) {
+function cb_erreur($text, $conf_title="") {
     global $globals;
     echo "Error: ".$text."\n";
     $mymail = new PlMailer();
     $mymail->addTo($globals->money->email);
     $mymail->setFrom("webmaster@" . $globals->mail->domain);
     $mymail->setSubject("erreur lors d'un télépaiement (CyberPaiement)");
-    $mymail->setTxtBody("raison de l'erreur : ".$text."\n".
-                        "paiement : $conf_title \n\n".
-                        "dump de REQUEST :\n".
-                        var_export($_REQUEST,true));
+    $content = "raison de l'erreur : " . $text . "\n";
+    if ($conf_title != "") {
+        $content = $content."paiement : ".$conf_title."\n";
+    }
+    $content = $content . "dump de REQUEST :\n" . var_export($_REQUEST, true);
+    $mymail->setTxtBody($content);
     $mymail->send();
     echo "Notification sent.\n";
     exit;
@@ -270,7 +272,7 @@ class PaymentModule extends PLModule
 
         /* on extrait le code de retour */
         if (Env::v('vads_result') != '00') {
-            cb_erreur('erreur lors du paiement : ?? (' . Env::v('vads_result') . ')');
+            cb_erreur('erreur lors du paiement : ?? (' . Env::v('vads_result') . ')', $conf_title);
         }
 
         /* on fait l'insertion en base de donnees */