Merge branch 'master' into dist/envole/6/master
This commit is contained in:
commit
ee4c59a859
|
@ -1237,8 +1237,6 @@ class UserController extends Controller
|
||||||
if($key=="pagebookmark") {
|
if($key=="pagebookmark") {
|
||||||
if(is_array($preference)&&array_key_exists("pagebookmark",$preference)) {
|
if(is_array($preference)&&array_key_exists("pagebookmark",$preference)) {
|
||||||
$oldid=$preference["pagebookmark"][0];
|
$oldid=$preference["pagebookmark"][0];
|
||||||
echo "OLDID = $oldid";
|
|
||||||
echo "ID = $value";
|
|
||||||
if($oldid==$value) {
|
if($oldid==$value) {
|
||||||
unset($preference["pagebookmark"]);
|
unset($preference["pagebookmark"]);
|
||||||
$em = $this->getDoctrine()->getManager();
|
$em = $this->getDoctrine()->getManager();
|
||||||
|
|
Loading…
Reference in New Issue