bachir/popsu-d7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

security update core+modules

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2015-04-26 18:38:56 +02:00
parent 2f45ea820a
commit 7c96373038
1022 changed files with 30319 additions and 11259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sites/all/modules/ckeditor/includes/filemanager.config.php
View File

@@ -2,7 +2,7 @@
/**
* CKEditor - The text editor for the Internet - http://ckeditor.com
* Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
* Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
*
* == BEGIN LICENSE ==
*
@@ -86,7 +86,14 @@ CheckAuthentication();
if (isset($_SESSION['ckeditor']['UserFilesPath'], $_SESSION['ckeditor']['UserFilesAbsolutePath'])) {
$baseUrl = $_SESSION['ckeditor']['UserFilesPath'];
$baseDir = $_SESSION['ckeditor']['UserFilesAbsolutePath'];
// To deal with multiple application servers it's better to let CKFinder guess the server path based on the URL,
// because the server side path changes on each request (#2127467).
if (isset($_SERVER['PANTHEON_ENVIRONMENT'])) {
$baseDir = resolveUrl($baseUrl);
}
else {
$baseDir = $_SESSION['ckeditor']['UserFilesAbsolutePath'];
}
}
else {
// Nothing in session? Shouldn't happen... anyway let's try to upload it in the (almost) right place