Judebert's fix: Fix returning unset but existent array key in pickKey

diff --git a/include/functions.inc.php b/include/functions.inc.php
index 04a76ec722f35ff654fa5eaaf2de8fa8ddc8f40b..5d1a8fd68f92cc66ce5fc9df9b129caf921a12eb 100644 (file)
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -487,7 +487,7 @@ function serendipity_sendMail($to, $subject, $message, $fromMail, $headers = NUL
         'fromName' => &$fromName,
         'fromMail' => &$fromMail,
         'blogMail' => $serendipity['blogMail'],
-        'version'  => 'Serendipity/' . $serendipity['version'],
+        'version'  => 'Serendipity' . ($serendipity['expose_s9y'] ? '/' . $serendipity['version'] : ''),
         'legacy'   => true,
         'headers'  => &$headers,
         'message'  => &$message
@@ -513,8 +513,10 @@ function serendipity_sendMail($to, $subject, $message, $fromMail, $headers = NUL
             $maildata['headers'][] = 'From: "'. $maildata['fromName'] .'" <'. $maildata['blogMail'] .'>';
         }
         $maildata['headers'][] = 'Reply-To: "'. $maildata['fromName'] .'" <'. $maildata['fromMail'] .'>';
-        $maildata['headers'][] = 'X-Mailer: ' . $maildata['version'];
-        $maildata['headers'][] = 'X-Engine: PHP/'. phpversion();
+        if ($serendipity['expose_s9y']) {
+            $maildata['headers'][] = 'X-Mailer: ' . $maildata['version'];
+            $maildata['headers'][] = 'X-Engine: PHP/'. phpversion();
+        }
         $maildata['headers'][] = 'Message-ID: <'. md5(microtime() . uniqid(time())) .'@'. $_SERVER['HTTP_HOST'] .'>';
         $maildata['headers'][] = 'MIME-Version: 1.0';
         $maildata['headers'][] = 'Precedence: bulk';
@@ -1151,7 +1153,9 @@ function &serendipity_pickKey(&$array, $key, $default) {
 
     // array_key_exists() copies array, so is much slower.
     if (in_array($key, array_keys($array))) {
-        return $array[$key];
+        if (isset($array[$key])) {
+            return $array[$key];
+        }
     }
     foreach($array AS $child) {
         if (is_array($child) && isset($child[$key]) && !empty($child[$key])) {