[Fmsystem-commits] [6509] merge 6507:6508 from trunk

[Sigurd Nes]

Revision: 6509
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6509
Author:   sigurdne
Date:     2010-10-21 12:40:25 +0000 (Thu, 21 Oct 2010)
Log Message:
-----------
merge 6507:6508 from trunk

Modified Paths:
--------------
    branches/Version-1_0-branch/property/inc/class.uijasper.inc.php

Property Changed:
----------------
    branches/Version-1_0-branch/


Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506
   + 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508

Modified: branches/Version-1_0-branch/property/inc/class.uijasper.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uijasper.inc.php     
2010-10-21 12:39:42 UTC (rev 6508)
+++ branches/Version-1_0-branch/property/inc/class.uijasper.inc.php     
2010-10-21 12:40:25 UTC (rev 6509)
@@ -697,7 +697,7 @@
                                $values['input'] = $values_attribute;
                                $first_run = false;
                        }
-                       
if(!$this->bocommon->check_perms($this->grants[$values['user_id']], 
PHPGW_ACL_DELETE))
+                       
if(!$this->bocommon->check_perms($this->grants[$values['user_id']], 
PHPGW_ACL_READ))
                        {
                                echo lang('not allowed');
                                $GLOBALS['phpgw']->common->phpgw_exit();