diff options
| author | Dhruv <dhruv.goel92@gmail.com> | 2014-09-21 11:31:13 +0530 |
|---|---|---|
| committer | Dhruv <dhruv.goel92@gmail.com> | 2014-09-21 11:31:13 +0530 |
| commit | 93dc33b00289601ced4453b02b1bcee9e0ea68b2 (patch) | |
| tree | e7036f9aa26483068c1bf13ebf93f7d2a64578de /phpBB/includes/acp | |
| parent | 314cda18343c5fb999b0a93c6c5f84bd079541f9 (diff) | |
| parent | 84e68b3a73183322e970df39b7bd9d1afd37be8a (diff) | |
| download | forums-93dc33b00289601ced4453b02b1bcee9e0ea68b2.tar forums-93dc33b00289601ced4453b02b1bcee9e0ea68b2.tar.gz forums-93dc33b00289601ced4453b02b1bcee9e0ea68b2.tar.bz2 forums-93dc33b00289601ced4453b02b1bcee9e0ea68b2.tar.xz forums-93dc33b00289601ced4453b02b1bcee9e0ea68b2.zip | |
Merge branch 'develop-ascraeus' into develop
# By Jakub Senko
# Via Dhruv Goel (1) and Jakub Senko (1)
* develop-ascraeus:
[ticket/13045] Remove Pragma headers
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_database.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_icons.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_database.php b/phpBB/includes/acp/acp_database.php index 8f9c155ffc..0c52f82459 100644 --- a/phpBB/includes/acp/acp_database.php +++ b/phpBB/includes/acp/acp_database.php @@ -269,7 +269,7 @@ class acp_database break; } - header('Pragma: no-cache'); + header('Cache-Control: private, no-cache'); header("Content-Type: $mimetype; name=\"$name\""); header("Content-disposition: attachment; filename=$name"); @@ -510,7 +510,7 @@ class base_extractor if ($download == true) { $name = $filename . $ext; - header('Pragma: no-cache'); + header('Cache-Control: private, no-cache'); header("Content-Type: $mimetype; name=\"$name\""); header("Content-disposition: attachment; filename=$name"); diff --git a/phpBB/includes/acp/acp_icons.php b/phpBB/includes/acp/acp_icons.php index 028025b547..9265415dd1 100644 --- a/phpBB/includes/acp/acp_icons.php +++ b/phpBB/includes/acp/acp_icons.php @@ -737,7 +737,7 @@ class acp_icons { garbage_collection(); - header('Pragma: public'); + header('Cache-Control: public'); // Send out the Headers header('Content-Type: text/x-delimtext; name="' . $mode . '.pak"'); |