Commit 495c099e8509f712ca83a82354c4e034407380de

Authored by Jarrett Jordaan
1 parent fc001bbf

PT:1967272: Resolved location of config files for source only installs

Committed by: Jarrett Jordaan

Reviewed by: Megan Watson
setup/wizard/steps/configuration.php
@@ -703,17 +703,17 @@ class configuration extends Step @@ -703,17 +703,17 @@ class configuration extends Step
703 */ 703 */
704 public function getContentPath() { 704 public function getContentPath() {
705 $configPath = realpath('../../../config/config-path'); 705 $configPath = realpath('../../../config/config-path');
706 - if($configPath == '') 706 + if(!file_exists($configPath))
707 $configPath = realpath('../../config/config-path'); 707 $configPath = realpath('../../config/config-path');
708 - if(!$configPath) return false; 708 + if(!file_exists($configPath)) return false;
709 return $configPath; 709 return $configPath;
710 } 710 }
711 711
712 public function getCachePath() { 712 public function getCachePath() {
713 $cachePath = realpath('../../../config/cache-path'); 713 $cachePath = realpath('../../../config/cache-path');
714 - if($cachePath == '') 714 + if(!file_exists($cachePath))
715 $cachePath = realpath('../../config/cache-path'); 715 $cachePath = realpath('../../config/cache-path');
716 - if(!$cachePath) return false; 716 + if(!file_exists($cachePath)) return false;
717 return $cachePath; 717 return $cachePath;
718 } 718 }
719 } 719 }