From f6ae7096a6dd9a67c5041bf75ca906282c64ede9 Mon Sep 17 00:00:00 2001 From: hickert Date: Thu, 10 Aug 2006 07:09:14 +0000 Subject: [PATCH] Fixed picture_loading. Acls aren't set in constructor, and so acl check ever failed git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@4459 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/personal/generic/class_user.inc | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc index 32d0ba402..6f5bd912c 100644 --- a/plugins/personal/generic/class_user.inc +++ b/plugins/personal/generic/class_user.inc @@ -1154,20 +1154,18 @@ class user extends plugin /* Load picture from file to object */ function set_picture($filename ="") { - if($this->acl_is_writeable("userPicture",(!is_object($this->parent) && !isset($_SESSION['edit'])))){ - if (!is_file($filename) || $filename =="" ){ - $filename= "./images/default.jpg"; - $this->jpegPhoto= "*removed*"; - } + if (!is_file($filename) || $filename =="" ){ + $filename= "./images/default.jpg"; + $this->jpegPhoto= "*removed*"; + } - $fd = fopen ($filename, "rb"); - $this->photoData= fread ($fd, filesize ($filename)); - $_SESSION['binary']= $this->photoData; - $_SESSION['binarytype']= "image/jpeg"; - $this->jpegPhoto= ""; + $fd = fopen ($filename, "rb"); + $this->photoData= fread ($fd, filesize ($filename)); + $_SESSION['binary']= $this->photoData; + $_SESSION['binarytype']= "image/jpeg"; + $this->jpegPhoto= ""; - fclose ($fd); - } + fclose ($fd); } -- 2.30.2