mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-08 15:57:01 +02:00
Code Issues Releases Wiki Activity

Update installer so that it works if site profile is already installed in /site/ rather than /site-name/

Browse Source
This commit is contained in:
Ryan Cramer
2024-03-28 08:36:56 -04:00
parent 55a241e2f1
commit 3256cb9000
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
install.php
View File

@@ -187,7 +187,7 @@ class Installer {
if($dir->isDot() || !$dir->isDir()) continue; if($dir->isDot() || !$dir->isDir()) continue;
$name = $dir->getBasename(); $name = $dir->getBasename();
$path = rtrim($dir->getPathname(), '/') . '/'; $path = rtrim($dir->getPathname(), '/') . '/';
if(strpos($name, 'site-') !== 0) continue; if(strpos($name, 'site-') !== 0 && $name !== 'site') continue;
$passed = true; $passed = true;
foreach($dirTests as $test) if(!is_dir($path . $test)) $passed = false; foreach($dirTests as $test) if(!is_dir($path . $test)) $passed = false;
foreach($fileTests as $test) if(!file_exists($path . $test)) $passed = false; foreach($fileTests as $test) if(!file_exists($path . $test)) $passed = false;
@@ -1250,6 +1250,7 @@ class Installer {
); );
foreach($this->findProfiles() as $name => $profile) { foreach($this->findProfiles() as $name => $profile) {
if($name === 'site') continue;
$title = empty($profile['title']) ? $name : $profile['title']; $title = empty($profile['title']) ? $name : $profile['title'];
$items[$name] = array( $items[$name] = array(
'label' => "Remove unused $title site profile (/$name/)", 'label' => "Remove unused $title site profile (/$name/)",