Skip to content

[4.0] [MVC] Always set model/view prefix, correct base path detection #25367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Jul 23, 2019
Merged

[4.0] [MVC] Always set model/view prefix, correct base path detection #25367

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
edd3a46
Correct base path checks
SharkyKZ Jun 29, 2019
fb28a7e
Make sure prefix is always set
SharkyKZ Jun 29, 2019
26ca7a4
Merge branch '4.0-dev' into j4/mvcBasePath
SharkyKZ Jun 29, 2019
11481ce
Merge branch '4.0-dev' into j4/mvcBasePath
SharkyKZ Jun 30, 2019
6562a79
Merge branch '4.0-dev' into j4/mvcBasePath
SharkyKZ Jun 30, 2019
e92d92d
Update libraries/src/MVC/Controller/BaseController.php
SharkyKZ Jul 1, 2019
0888b64
Update libraries/src/MVC/Controller/BaseController.php
SharkyKZ Jul 1, 2019
ba443cd
Merge branch '4.0-dev' into j4/mvcBasePath
SharkyKZ Jul 1, 2019
8859c97
Unnecessary Path::clean()
SharkyKZ Jul 2, 2019
b71cc44
Merge remote-tracking branch 'upstream/4.0-dev' into j4/mvcBasePath
SharkyKZ Jul 2, 2019
cb8d6cc
Merge branch '4.0-dev' into j4/mvcBasePath
SharkyKZ Jul 6, 2019
ebbffee
Merge branch '4.0-dev' into j4/mvcBasePath
rdeutz Jul 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 28 additions & 14 deletions libraries/src/MVC/Controller/BaseController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,11 +580,6 @@ protected function checkEditId($context, $id)
*/
protected function createModel($name, $prefix = '', $config = array())
{
if (!$prefix)
{
$prefix = $this->app->getName();
}

$model = $this->factory->createModel($name, $prefix, $config);

if ($model === null)
Expand Down Expand Up @@ -615,11 +610,6 @@ protected function createModel($name, $prefix = '', $config = array())
*/
protected function createView($name, $prefix = '', $type = '', $config = array())
{
if (!$prefix)
{
$prefix = $this->app->getName();
}

$config['paths'] = $this->paths['view'];
return $this->factory->createView($name, $prefix, $type, $config);
}
Expand Down Expand Up @@ -755,9 +745,21 @@ public function getModel($name = '', $prefix = '', $config = array())
$name = $this->getName();
}

if (empty($prefix) && $this->factory instanceof LegacyFactory)
if (!$prefix)
{
$prefix = $this->model_prefix;
if ($this->factory instanceof LegacyFactory)
{
$prefix = $this->model_prefix;
}
// When the front uses a back end model
elseif (!empty($config['base_path']) && strpos(Path::clean($config['base_path']), Path::clean(JPATH_ADMINISTRATOR)) === 0)
{
$prefix = 'Administrator';
}
else
{
$prefix = $this->app->getName();
}
}

if ($model = $this->createModel($name, $prefix, $config))
Expand Down Expand Up @@ -865,9 +867,21 @@ public function getView($name = '', $type = '', $prefix = '', $config = array())
$name = $this->getName();
}

if (empty($prefix) && $this->factory instanceof LegacyFactory)
if (!$prefix)
{
$prefix = $this->getName() . 'View';
if ($this->factory instanceof LegacyFactory)
{
$prefix = $this->getName() . 'View';
}
// When the front uses a back end view
elseif (!empty($config['base_path']) && strpos(Path::clean($config['base_path']), Path::clean(JPATH_ADMINISTRATOR)) === 0)
{
$prefix = 'Administrator';
}
else
{
$prefix = $this->app->getName();
}
}

if (empty(self::$views[$name][$type][$prefix]))
Expand Down
12 changes: 0 additions & 12 deletions libraries/src/MVC/Factory/MVCFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,12 +98,6 @@ public function createModel($name, $prefix = '', array $config = [])
$name = preg_replace('/[^A-Z0-9_]/i', '', $name);
$prefix = preg_replace('/[^A-Z0-9_]/i', '', $prefix);

// When the front uses a back end model
if (!$prefix && !empty($config['base_path']) && strpos($config['base_path'], '/administrator/') !== false)
{
$prefix = 'Administrator';
}

if (!$prefix)
{
@trigger_error(
Expand Down Expand Up @@ -150,12 +144,6 @@ public function createView($name, $prefix = '', $type = '', array $config = [])
$prefix = preg_replace('/[^A-Z0-9_]/i', '', $prefix);
$type = preg_replace('/[^A-Z0-9_]/i', '', $type);

// When the front uses a back end view
if (!$prefix && !empty($config['base_path']) && strpos($config['base_path'], '/administrator/') !== false)
{
$prefix = 'Administrator';
}

if (!$prefix)
{
@trigger_error(
Expand Down