hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-16 22:43:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHRAS-1745_PORT_custom_links' into PHRAS-1735_add_git_log

Browse Source 
# Conflicts:
#	.bowerrc
This commit is contained in:
Mike Ng
2018-01-08 16:37:46 +04:00
parent a853ec7d8d
commit a08a55b58e
9 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Alchemy/Phrasea/Controller/Admin/SetupController.php
View File

@@ -38,12 +38,10 @@ class SetupController extends Controller
public function submitGlobalsAction(Request $request)
{
if (null !== $this->configuration->get('registry'))
{
if (null !== $this->configuration->get('registry')) {
$form = $this->registryFormManipulator->createForm($this->configuration);
}
else
{
else {
$form = $this->registryFormManipulator->createForm();
}