Cadoles
/
ninegate
20
0
Fork 0
Code Issues 29 Pull Requests Projects 1 Releases Wiki Activity

Compare commits

base: Cadoles:5147a2b105670114e7e9bfb7397c9ca76dfb8067
Branches Tags
Cadoles:master
Cadoles:dist/envole/6/master
Cadoles:build/envole/envole-6/unstable
...
compare: Cadoles:98718ccc1e64f68b2ca7f1bdf9a19f071900a077
Branches Tags
Cadoles:master
Cadoles:dist/envole/6/master
Cadoles:build/envole/envole-6/unstable

2 Commits
5147a2b105 ... 98718ccc1e

Author SHA1 Message Date
Arnaud Fornerot 98718ccc1e Merge branch 'master' into dist/envole/6/master 2021-07-12 16:35:55 +02:00
Christophe LEON ed75b5f5c3 fixes #31884 , faire en sortes sur les urls soient compatibles https et http 2021-07-12 18:10:11 +04:00
1 changed files with 2 additions and 1 deletions
Show Stats Expand all files Collapse all files

3
src/ninegate-1.0/src/Cadoles/EdispatcherBundle/Controller/ApiController.php
View File

@ -200,7 +200,8 @@ class ApiController extends Controller
$bookmarks=null; $bookmarks=null;
$items=null; $items=null;
$itemcategorys=null; $itemcategorys=null;
$weburl="https://".$this->getParameter("weburl")."/".$this->getParameter("alias")."/"; # fixe #31884 "https://" => "//"
$weburl="//".$this->getParameter("weburl")."/".$this->getParameter("alias")."/";
$em->getRepository("CadolesPortalBundle:Item")->getUserItems($user,$bookmarks,$items,$itemcategorys,null,$ssoitems,3); $em->getRepository("CadolesPortalBundle:Item")->getUserItems($user,$bookmarks,$items,$itemcategorys,null,$ssoitems,3);