Robert Vogel has submitted this change and it was merged.
Change subject: BsFileSystemHelper: Fixed Fatal
......................................................................
BsFileSystemHelper: Fixed Fatal
* FileSystemHelper returned no status object
* Fixed typo in exception
Change-Id: I8f5534bd4a15de0795f3fe5c2fb05eaa550d8c90
---
M includes/utility/FileSystemHelper.class.php
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/includes/utility/FileSystemHelper.class.php
b/includes/utility/FileSystemHelper.class.php
index 86e95c9..98a741f 100644
--- a/includes/utility/FileSystemHelper.class.php
+++ b/includes/utility/FileSystemHelper.class.php
@@ -13,7 +13,7 @@
return
Status::newFatal(wfMessage("bs-filesystemhelper-has-path-traversal")->plain());
if (!empty($sSubDirName) && !preg_match('#^[a-zA-Z/\\\]+#',
$sSubDirName)) {
wfProfileOut(__METHOD__);
- return Status::newFatal('Requested subdirectory of ' .
BS_DATA_DIR . ' contains illegal chars');
+ return Status::newFatal('Requested subdirectory of ' .
BS_CACHE_DIR . ' contains illegal chars');
}
if (!is_dir(BS_CACHE_DIR)) {
if (!mkdir(BS_CACHE_DIR, 0777, true)) {
@@ -33,6 +33,8 @@
wfProfileOut(__METHOD__);
return Status::newFatal(BS_CACHE_DIR . ' is not
accessible');
}
+
+ return Status::newGood(BS_CACHE_DIR . '/' . $sSubDirName);
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/174956
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8f5534bd4a15de0795f3fe5c2fb05eaa550d8c90
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Pwirth <[email protected]>
Gerrit-Reviewer: Mglaser <[email protected]>
Gerrit-Reviewer: Pigpen <[email protected]>
Gerrit-Reviewer: Robert Vogel <[email protected]>
Gerrit-Reviewer: Smuggli <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
