Merge branch 'master' into dist/envole/6/master
This commit is contained in:
commit
98718ccc1e
@ -200,7 +200,8 @@ class ApiController extends Controller
|
||||
$bookmarks=null;
|
||||
$items=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);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user