Merge changeset 3047 from trunk to branch stable 1.0.

This commit is contained in:
Alexis Lahouze 2011-06-06 13:40:08 +00:00
parent 8f337a589e
commit 2f749f0b36
1 changed files with 19 additions and 17 deletions

View File

@ -126,6 +126,7 @@ for($i=0;$i<$r["nsub"];$i++) {
}
?></td>
<td><?php
if (!(!$isinvited && $dt[strtolower($r["sub"][$i]["type"])]["enable"] != "ALL" )) {
if ( $r['sub'][$i]['web_action'] !='DELETE') {
switch ($r['sub'][$i]['enable']) {
case 'ENABLED':
@ -143,6 +144,7 @@ for($i=0;$i<$r["nsub"];$i++) {
__("Desactivation pending");
break;
}
}
}?></td>
<td><?php
switch ($r['sub'][$i]['web_action']) {