merge from 1.5.3.2 (~r11225)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@11226 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-09-13 06:14:45 +00:00
parent 54e3a72065
commit 77f5aa2671
313 changed files with 8058 additions and 14251 deletions

View file

@ -174,7 +174,7 @@
switch($permission_target) {
case 'root' :
case 'manager' :
$this->stop('msg_not_permitted_act');
$this->stop('msg_is_not_administrator');
return;
case 'member' :
if(!$is_logged)
@ -334,7 +334,7 @@
if(isset($this->xml_info->action->{$this->act}) && method_exists($this, $this->act)) {
// Check permissions
if(!$this->grant->access){
if($this->module_srl && !$this->grant->access){
$this->stop("msg_not_permitted_act");
return FALSE;
}