Skip to content

Commit 687c1d0

Browse files
author
Raymond Benc
committed
Updating upgrade routine to only check if folders are writable if version is not greater than 4.0.0
1 parent 19ffb21 commit 687c1d0

File tree

2 files changed

+13
-14
lines changed

2 files changed

+13
-14
lines changed

PF.Base/include/checksum/md5

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
b41e07ec10d99cc5f9a83db7c3488e6e composer.lock
2-
4a9c6ab53e754a0953a0a47a724f826b include/checksum/md5
2+
a55bd3f40861a228409767b4eecf4cda include/checksum/md5
33
d7f7e3d45fa8602bec28e7a51c902110 include/cron/exec.php
44
68b329da9893e34099c7d8ad5cb9c940 include/cron/index.html
55
68b329da9893e34099c7d8ad5cb9c940 include/index.html

PF.Base/install/include/installer.class.php

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -745,20 +745,19 @@ private function _requirement()
745745
$errors[] = 'No database driver found.';
746746
}
747747

748-
$parent = dirname(dirname(dirname(dirname(__FILE__))));
749-
$dirs = [PHPFOX_DIR, PHPFOX_DIR_SITE];
750-
foreach ($dirs as $dir) {
751-
if (@!is_writable($dir)) {
752-
$dir = str_replace($parent, '', $dir);
753-
$dir = str_replace('/PF.Base/../', '/', $dir);
754-
// $dir = str_replace('../', '', $dir);
755-
/*
756-
if (substr($dir, 0, 4) == 'file') {
757-
$dir = 'PF.Base/' . $dir;
758-
}
759-
*/
748+
if ($this->_bUpgrade && version_compare($this->_getCurrentVersion(), '4.0.0', '>')) {
749+
750+
}
751+
else {
752+
$parent = dirname(dirname(dirname(dirname(__FILE__))));
753+
$dirs = [PHPFOX_DIR, PHPFOX_DIR_SITE];
754+
foreach ($dirs as $dir) {
755+
if (@!is_writable($dir)) {
756+
$dir = str_replace($parent, '', $dir);
757+
$dir = str_replace('/PF.Base/../', '/', $dir);
760758

761-
$errors[] = "Directory needs to be writable: {$dir}";
759+
$errors[] = "Directory needs to be writable: {$dir}";
760+
}
762761
}
763762
}
764763

0 commit comments

Comments
 (0)