Codestyle fixes
Signed-off-by: Roland Dalmulder <contact@rolandd.com>
This commit is contained in:
parent
533a602b40
commit
ec181cb72c
|
@ -629,8 +629,7 @@ class PullModel extends AbstractModel
|
||||||
{
|
{
|
||||||
// We only create a backup if the file already exists
|
// We only create a backup if the file already exists
|
||||||
if ($file->action === 'deleted'
|
if ($file->action === 'deleted'
|
||||||
|| (file_exists(JPATH_ROOT . '/' . $file->filename)
|
|| (file_exists(JPATH_ROOT . '/' . $file->filename) && $file->action === 'modified')
|
||||||
&& $file->action === 'modified')
|
|
||||||
|| (file_exists(JPATH_ROOT . '/' . $file->originalFile) && $file->action === 'renamed'))
|
|| (file_exists(JPATH_ROOT . '/' . $file->originalFile) && $file->action === 'renamed'))
|
||||||
{
|
{
|
||||||
$filename = $file->action === 'renamed' ? $file->originalFile : $file->filename;
|
$filename = $file->action === 'renamed' ? $file->originalFile : $file->filename;
|
||||||
|
|
|
@ -474,7 +474,6 @@ class PullsModel extends ListModel
|
||||||
];
|
];
|
||||||
|
|
||||||
$data[] = implode(',', $pullData);
|
$data[] = implode(',', $pullData);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// If there are no pulls to insert then bail, assume we're finished
|
// If there are no pulls to insert then bail, assume we're finished
|
||||||
|
|
Loading…
Reference in New Issue