Index: trunk/admin/install/upgrades/changelog_1_1_5.txt
===================================================================
diff -u -r3522 -r3527
--- trunk/admin/install/upgrades/changelog_1_1_5.txt (.../changelog_1_1_5.txt) (revision 3522)
+++ trunk/admin/install/upgrades/changelog_1_1_5.txt (.../changelog_1_1_5.txt) (revision 3527)
@@ -7,7 +7,9 @@
File in-portal/admin/install/upgrades/readme_1_1_5.txt is new
File in-portal/admin/listview/listview.php changed
File in-portal/kernel/action.php changed
+File in-portal/kernel/startup.php changed
File in-portal/kernel/admin/include/help/configure_general.txt changed
+File in-portal/kernel/include/custommetadata.php changed
File in-portal/kernel/include/emailmessage.php changed
File in-portal/kernel/include/image.php changed
File in-portal/kernel/include/itemreview.php changed
@@ -19,9 +21,11 @@
File in-portal/kernel/units/general/inp_ses_storage.php changed
File in-portal/kernel/units/users/users_event_handler.php changed
File kernel4_dev/kernel4/application.php changed
+File kernel4_dev/kernel4/globals.php changed
File kernel4_dev/kernel4/parser/tags.php changed
File kernel4_dev/kernel4/processors/main_processor.php changed
File kernel4_dev/kernel4/session/session.php changed
+File kernel4_dev/kernel4/utility/debugger.php changed
File kernel4_dev/kernel4/utility/email.php changed
File kernel4_dev/kernel4/utility/formatters.php changed
File cmseditor/fckconfig.js changed
Index: trunk/core/kernel/utility/debugger.php
===================================================================
diff -u -r3287 -r3527
--- trunk/core/kernel/utility/debugger.php (.../debugger.php) (revision 3287)
+++ trunk/core/kernel/utility/debugger.php (.../debugger.php) (revision 3527)
@@ -393,7 +393,7 @@
function appendRequest()
{
- $script = $_SERVER['SCRIPT_FILENAME'];
+ $script = $_SERVER['PHP_SELF'];
$this->appendHTML('ScriptName: '.$this->getFileLink($script,1,basename($script)).' ('.dirname($script).')');
$this->appendHTML('DomViewer: ');
Index: trunk/kernel/include/emailmessage.php
===================================================================
diff -u -r3520 -r3527
--- trunk/kernel/include/emailmessage.php (.../emailmessage.php) (revision 3520)
+++ trunk/kernel/include/emailmessage.php (.../emailmessage.php) (revision 3527)
@@ -761,7 +761,13 @@
$headers = "To: <".$To.">"."\n".$headers;
$headers = "Subject: ".trim($Subject)."\r\n".$headers;
- $send_params['recipients'] = array($To); // The recipients (can be multiple)
+ if (strpos($To, ',') !== false) {
+ $To = str_replace(' ', '', $this->To);
+ $send_params['recipients'] = explode(',', $this->To);
+ }
+ else {
+ $send_params['recipients'] = array($To); // The recipients (can be multiple)
+ }
$send_params['from'] = $From; // This is used as in the MAIL FROM: cmd
$send_params['headers'] = explode("\r\n",$headers);
// It should end up as the Return-Path: header
Index: trunk/core/kernel/utility/email.php
===================================================================
diff -u -r3510 -r3527
--- trunk/core/kernel/utility/email.php (.../email.php) (revision 3510)
+++ trunk/core/kernel/utility/email.php (.../email.php) (revision 3527)
@@ -399,7 +399,13 @@
}
- $send_params['recipients'] = array($this->To); // The recipients (can be multiple)
+ if (strpos($this->To, ',') !== false) {
+ $this->To = str_replace(' ', '', $this->To);
+ $send_params['recipients'] = explode(',', $this->To);
+ }
+ else {
+ $send_params['recipients'] = array($this->To); // The recipients (can be multiple)
+ }
$send_params['headers'] = array(
'From: '.$this->HeadersArray['From'], // Headers
'To: '.$this->HeadersArray['To'],
Index: trunk/kernel/action.php
===================================================================
diff -u -r3508 -r3527
--- trunk/kernel/action.php (.../action.php) (revision 3508)
+++ trunk/kernel/action.php (.../action.php) (revision 3527)
@@ -3,9 +3,6 @@
$ro_perm = $objSession->HasSystemPermission("SYSTEM_ACCESS.READONLY");
// ====== Debugger related: begin ======
-if (!isset($_SERVER['SCRIPT_FILENAME'])) {
- $_SERVER['SCRIPT_FILENAME'] = $_SERVER['SCRIPT_NAME'];
-}
$script = basename($_SERVER['PHP_SELF']);
$skipDebug = Array('index.php','tree.php','head.php','credits.php');
if( admin_login() && !in_array($script, $skipDebug) )