Replace 'http://localhost/' with AccessUrl::DEFAULT_ACCESS_URL

pull/3904/head
Julio Montoya 4 years ago
parent 0a87d5b64b
commit c217365840
  1. 2
      public/main/inc/lib/api.lib.php
  2. 4
      public/main/install/install.lib.php
  3. 2
      src/CoreBundle/DataFixtures/AccessUrlFixtures.php
  4. 2
      src/CoreBundle/Entity/AccessUrl.php

@ -5155,7 +5155,7 @@ function api_get_access_url($id, $returnDefault = true)
// information on another URL instead of the one asked as parameter
if (1 === $currentUrl) {
$rootWeb = api_get_path(WEB_PATH);
$default = 'http://localhost/';
$default = AccessUrl::DEFAULT_ACCESS_URL;
if ($result['url'] === $default && $rootWeb != $default) {
$result['url'] = $rootWeb;
}

@ -2300,10 +2300,10 @@ function installSchemas($container, $upgrade = false)
if (null === $accessUrl) {
$em = Database::getManager();
// Creating AccessUrl
// Creating AccessUrl.
$accessUrl = new AccessUrl();
$accessUrl
->setUrl('http://localhost/')
->setUrl(AccessUrl::DEFAULT_ACCESS_URL)
->setDescription('')
->setActive(1)
->setCreatedBy(1)

@ -45,7 +45,7 @@ class AccessUrlFixtures extends Fixture implements ContainerAwareInterface
$client->loginUser($admin);*/
$accessUrl = (new AccessUrl())
->setUrl('http://localhost/')
->setUrl(AccessUrl::DEFAULT_ACCESS_URL)
->setDescription('')
->setActive(1)
->setCreatedBy(1)

@ -29,6 +29,8 @@ use Symfony\Component\Validator\Constraints as Assert;
*/
class AccessUrl extends AbstractResource implements ResourceInterface
{
public const DEFAULT_ACCESS_URL = 'http://localhost/';
/**
* @ORM\Column(name="id", type="integer")
* @ORM\Id

Loading…
Cancel
Save