webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-29 21:24:44 +03:00
Code Activity

Merge branch 'QA_4_6'

Browse Source
This commit is contained in:
Michal Čihař
2016-07-26 16:07:01 +02:00
parent 3618801dfc 53af6a5699
commit 2f247ea461
2 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/Config.php
View File

@@ -736,10 +736,6 @@ class Config
}
$data = @curl_exec($handle);
if (! defined('TESTSUITE')) {
ini_set('session.use_only_cookies', '0');
ini_set('session.use_cookies', '0');
ini_set('session.use_trans_sid', '0');
ini_set('session.cache_limiter', 'nocache');
session_start();
}
if ($data === false) {

13
libraries/VersionInformation.php
View File

@@ -47,6 +47,9 @@ class VersionInformation
$response = $_SESSION['cache']['version_check']['response'];
} else {
$save = true;
if (! defined('TESTSUITE')) {
session_write_close();
}
$file = 'https://www.phpmyadmin.net/home_page/version.json';
if (ini_get('allow_url_fopen')) {
$context = array(
@@ -56,9 +59,6 @@ class VersionInformation
)
);
$context = Util::handleContext($context);
if (! defined('TESTSUITE')) {
session_write_close();
}
$response = file_get_contents(
$file,
false,
@@ -85,9 +85,6 @@ class VersionInformation
CURLOPT_TIMEOUT,
$connection_timeout
);
if (! defined('TESTSUITE')) {
session_write_close();
}
$response = curl_exec($curl_handle);
}
}
@@ -106,10 +103,6 @@ class VersionInformation
if ($save) {
if (! isset($_SESSION) && ! defined('TESTSUITE')) {
ini_set('session.use_only_cookies', 'false');
ini_set('session.use_cookies', 'false');
ini_set('session.use_trans_sid', 'false');
ini_set('session.cache_limiter', 'nocache');
session_start();
}
$_SESSION['cache']['version_check'] = array(