Merge changeset 3047 from trunk to branch stable 1.0.
This commit is contained in:
parent
8f337a589e
commit
2f749f0b36
|
@ -126,6 +126,7 @@ for($i=0;$i<$r["nsub"];$i++) {
|
||||||
}
|
}
|
||||||
?></td>
|
?></td>
|
||||||
<td><?php
|
<td><?php
|
||||||
|
if (!(!$isinvited && $dt[strtolower($r["sub"][$i]["type"])]["enable"] != "ALL" )) {
|
||||||
if ( $r['sub'][$i]['web_action'] !='DELETE') {
|
if ( $r['sub'][$i]['web_action'] !='DELETE') {
|
||||||
switch ($r['sub'][$i]['enable']) {
|
switch ($r['sub'][$i]['enable']) {
|
||||||
case 'ENABLED':
|
case 'ENABLED':
|
||||||
|
@ -143,6 +144,7 @@ for($i=0;$i<$r["nsub"];$i++) {
|
||||||
__("Desactivation pending");
|
__("Desactivation pending");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}?></td>
|
}?></td>
|
||||||
<td><?php
|
<td><?php
|
||||||
switch ($r['sub'][$i]['web_action']) {
|
switch ($r['sub'][$i]['web_action']) {
|
||||||
|
|
Loading…
Reference in New Issue