Merge pull request #699 from annando/issue-4814
Issue 4814: Unify the temp path location
This commit is contained in:
commit
9a48452e09
3 changed files with 4 additions and 4 deletions
|
@ -29,7 +29,7 @@ class Diaspora_Connection {
|
|||
$this->setPassword($password);
|
||||
}
|
||||
|
||||
$this->cookiejar = tempnam(sys_get_temp_dir(), 'cookies');
|
||||
$this->cookiejar = tempnam(get_temppath(), 'cookies');
|
||||
return $this;
|
||||
}
|
||||
|
||||
|
|
|
@ -11,7 +11,7 @@ class Diasphp {
|
|||
$this->token_regex = '/content="(.*?)" name="csrf-token/';
|
||||
|
||||
$this->pod = $pod;
|
||||
$this->cookiejar = tempnam(sys_get_temp_dir(), 'cookies');
|
||||
$this->cookiejar = tempnam(get_temppath(), 'cookies');
|
||||
}
|
||||
|
||||
function __destruct() {
|
||||
|
|
|
@ -2350,11 +2350,11 @@ class PHPMailer
|
|||
throw new phpmailerException($this->lang('extension_missing') . 'openssl');
|
||||
}
|
||||
// @TODO would be nice to use php://temp streams here, but need to wrap for PHP < 5.1
|
||||
$file = tempnam(sys_get_temp_dir(), 'mail');
|
||||
$file = tempnam(get_temppath(), 'mail');
|
||||
if (false === file_put_contents($file, $body)) {
|
||||
throw new phpmailerException($this->lang('signing') . ' Could not write temp file');
|
||||
}
|
||||
$signed = tempnam(sys_get_temp_dir(), 'signed');
|
||||
$signed = tempnam(get_temppath(), 'signed');
|
||||
//Workaround for PHP bug https://bugs.php.net/bug.php?id=69197
|
||||
if (empty($this->sign_extracerts_file)) {
|
||||
$sign = @openssl_pkcs7_sign(
|
||||
|
|
Loading…
Reference in a new issue