Merge branch 'master' into dist/envole/6/master

src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/BookmarkController.php

@@ -41,7 +41,7 @@ class BookmarkController extends Controller
                 $user=$pagewidget->getPage()->getUser();
                 if($user!=$this->getUser())  throw $this->createNotFoundException('Permission denied');
             }
-            else {
+            elseif($usage=="group") {
                 $groupentity=$this->getDoctrine()->getRepository("CadolesCoreBundle:Group")->find($group);
                 $usergroup=$this->getDoctrine()->getRepository("CadolesCoreBundle:UserGroup")->findoneby(["user"=>$this->getUser(),"group"=>$groupentity]);
                 if(!$usergroup or $usergroup->getRolegroup()<50) throw $this->createNotFoundException('Permission denied');