Skip to content
This repository was archived by the owner on Nov 27, 2020. It is now read-only.

Commit 6920db7

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: Display a directory separator adapted to the OS Symfony is running on updated VENDORS for 2.7.17
2 parents 019b6be + 51b867a commit 6920db7

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

app/Resources/views/default/index.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<svg id="icon-status" width="1792" height="1792" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg"><path d="M1671 566q0 40-28 68l-724 724-136 136q-28 28-68 28t-68-28l-136-136-362-362q-28-28-28-68t28-68l136-136q28-28 68-28t68 28l294 295 656-657q28-28 68-28t68 28l136 136q28 28 28 68z" fill="#759E1A"/></svg>
1313

1414
Your application is now ready. You can start working on it at:
15-
<code>{{ base_dir }}/</code>
15+
<code>{{ base_dir }}</code>
1616
</p>
1717
</div>
1818

src/AppBundle/Controller/DefaultController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public function indexAction(Request $request)
1515
{
1616
// replace this example code with whatever you need
1717
return $this->render('default/index.html.twig', array(
18-
'base_dir' => realpath($this->container->getParameter('kernel.root_dir').'/..'),
18+
'base_dir' => realpath($this->container->getParameter('kernel.root_dir').'/..').DIRECTORY_SEPARATOR,
1919
));
2020
}
2121
}

0 commit comments

Comments
 (0)