Skip to content

Commit

Permalink
Merge pull request #5052 from Gustry/php-cs-fixer-master
Browse files Browse the repository at this point in the history
Fix PHP-CS-Fixer on master, due to recent merge
  • Loading branch information
Gustry authored Dec 2, 2024
2 parents 67a6c80 + dbaa249 commit 01442d7
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion lizmap/modules/action/install/install.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public function install()
// $this->copyDirectoryContent('www', jApp::wwwPath());

// if ($this->firstDbExec())
// $this->execSQLScript('sql/install');
// $this->execSQLScript('sql/install');

/*if ($this->firstExec('acl2')) {
jAcl2DbManager::addSubject('my.subject', 'action~acl.my.subject', 'subject.group.id');
Expand Down
52 changes: 26 additions & 26 deletions lizmap/modules/filter/classes/filterDockable.listener.php
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
<?php

class filterDockableListener extends jEventListener
class filterDockableListener extends jEventListener
{
private function checkConfig($event, $dock)
{
private function checkConfig($event, $dock)
{
$project = $event->getParam('project');
$repository = $event->getParam('repository');
$project = $event->getParam('project');
$repository = $event->getParam('repository');

// Check config
jClasses::inc('filter~filterConfig');
$dv = new filterConfig($event->repository, $event->project);
// Check config
jClasses::inc('filter~filterConfig');
$dv = new filterConfig($event->repository, $event->project);

if ($dv->getStatus()) {
if ($dv->getStatus()) {

// Use template filterConfig
$assign = array();
$content = array('filter~filter_'.$dock, $assign);
$dock = new lizmapMapDockItem(
'filter',
jLocale::get('filter~filter.dock.title'),
$content,
15,
null, // fait via getMapAdditions
null
);
$event->add($dock);
}
// Use template filterConfig
$assign = array();
$content = array('filter~filter_'.$dock, $assign);
$dock = new lizmapMapDockItem(
'filter',
jLocale::get('filter~filter.dock.title'),
$content,
15,
null, // fait via getMapAdditions
null
);
$event->add($dock);
}
}

public function onmapDockable($event)
{
$this->checkConfig($event, 'dock');
}
public function onmapDockable($event)
{
$this->checkConfig($event, 'dock');
}
}

0 comments on commit 01442d7

Please sign in to comment.