FGFS-4.1/phpvms
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix public path in application bootstrap #887

Browse Source
This commit is contained in:
Nabeel Shahzad
2020-11-23 13:39:26 -05:00
parent 7e4c652330
commit be15426b5b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bootstrap/application.php
View File

@@ -73,6 +73,7 @@ class application extends Illuminate\Foundation\Application
public function setPublicPath($publicDirPath) public function setPublicPath($publicDirPath)
{ {
$this->publicDirPath = $publicDirPath; $this->publicDirPath = $publicDirPath;
$this->instance('path.public', $publicDirPath);
} }
/** /**
@@ -103,11 +104,6 @@ class application extends Illuminate\Foundation\Application
return $this->basePath.DS.'config'.($path ? DS.$path : $path); return $this->basePath.DS.'config'.($path ? DS.$path : $path);
} }
/*public function environmentPath()
{
return $this->environmentPath ?: $this->basePath;
}*/
public function langPath() public function langPath()
{ {
return $this->resourcePath().DS.'lang'; return $this->resourcePath().DS.'lang';
@@ -115,7 +111,11 @@ class application extends Illuminate\Foundation\Application
public function publicPath() public function publicPath()
{ {
return $this->publicDirPath ?: $this->basePath.DS.'public'; if (empty($this->publicDirPath)) {
return $this->basePath.DS.'public';
}
return $this->publicDirPath;
} }
public function resourcePath($path = '') public function resourcePath($path = '')