Bug #19020 ยป 8826.diff
| t3lib/class.t3lib_db.php (working copy) | ||
|---|---|---|
|
function sql_pconnect($TYPO3_db_host, $TYPO3_db_username, $TYPO3_db_password) {
|
||
|
// mysql_error() is tied to an established connection
|
||
|
// if the connection fails we need a different method to get the error message
|
||
|
ini_set('track_errors', 1);
|
||
|
ini_set('html_errors', 0);
|
||
|
@ini_set('track_errors', 1);
|
||
|
@ini_set('html_errors', 0);
|
||
|
if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['no_pconnect']) {
|
||
|
$this->link = @mysql_connect($TYPO3_db_host, $TYPO3_db_username, $TYPO3_db_password);
|
||
|
} else {
|
||
|
$this->link = @mysql_pconnect($TYPO3_db_host, $TYPO3_db_username, $TYPO3_db_password);
|
||
|
}
|
||
|
$error_msg = $php_errormsg;
|
||
|
ini_restore('track_errors');
|
||
|
ini_restore('html_errors');
|
||
|
@ini_restore('track_errors');
|
||
|
@ini_restore('html_errors');
|
||
|
if (!$this->link) {
|
||
|
t3lib_div::sysLog('Could not connect to MySQL server '.$TYPO3_db_host.' with user '.$TYPO3_db_username.': '.$error_msg,'Core',4);
|
||
| t3lib/class.t3lib_htmlmail.php (working copy) | ||
|---|---|---|
|
// but instead the php.ini parameter sendmail_from is used.
|
||
|
$returnPath = (strlen($this->returnPath) > 0) ? '-f "' . escapeshellarg($this->returnPath) . '"' : '';
|
||
|
if($this->returnPath) {
|
||
|
ini_set('sendmail_from', t3lib_div::normalizeMailAddress($this->returnPath));
|
||
|
@ini_set('sendmail_from', t3lib_div::normalizeMailAddress($this->returnPath));
|
||
|
}
|
||
|
$recipient = t3lib_div::normalizeMailAddress($this->recipient);
|
||
|
$recipient_copy = t3lib_div::normalizeMailAddress($this->recipient_copy);
|
||
| typo3/alt_clickmenu.php (working copy) | ||
|---|---|---|
|
$this->CB = t3lib_div::_GP('CB');
|
||
|
if(t3lib_div::_GP('ajax')) {
|
||
|
$this->ajax = 1;
|
||
|
ini_set('display_errors',0); // XML has to be parsed, no parse errors allowed
|
||
|
// XML has to be parsed, no parse errors allowed
|
||
|
@ini_set('display_errors', 0);
|
||
|
}
|
||
|
// Deal with Drag&Drop context menus
|
||