diff --git a/e107_admin/banlist.php b/e107_admin/banlist.php
index 560f90e3a..4772384f9 100644
--- a/e107_admin/banlist.php
+++ b/e107_admin/banlist.php
@@ -997,7 +997,7 @@ switch ($action)
";
- foreach ($ipAdministrator->getValidReasonList() as $i)
+ foreach ($ipAdministrator->getValidReasonList() as $i) //FIXME $frm->label()
{
$text .= "
@@ -1039,10 +1039,10 @@ switch ($action)
|
- ".$frm->checkbox('ban_over_import', 1).$frm->label(BANLAN_43, 'ban_over_import', 1)." |
+ ".$frm->checkbox('ban_over_import', 1, '', array('label' => BANLAN_43))." |
- ".$frm->checkbox('ban_over_expiry', 1).$frm->label(BANLAN_44, 'ban_over_expiry', 1)." |
+ ".$frm->checkbox('ban_over_expiry', 1, '', array('label' => BANLAN_44))." |
".BANLAN_46." |
diff --git a/e107_admin/newspost.php b/e107_admin/newspost.php
index 6c459f005..b5d1b6f42 100644
--- a/e107_admin/newspost.php
+++ b/e107_admin/newspost.php
@@ -2278,8 +2278,7 @@ class admin_newspost
".NWSLAN_15.": |
- ".$frm->radio('news_allow_comments', 0, !vartrue($_POST['news_allow_comments']))."".$frm->label(LAN_ENABLED, 'news_allow_comments', 0)."
- ".$frm->radio('news_allow_comments', 1, vartrue($_POST['news_allow_comments']))."".$frm->label(LAN_DISABLED, 'news_allow_comments', 1)."
+ ".$frm->radio_switch('news_allow_comments', vartrue($_POST['news_allow_comments']))."
".NWSLAN_18."
@@ -2346,7 +2345,7 @@ class admin_newspost
|
".LAN_NEWS_28.": |
- ".$frm->checkbox('news_sticky', '1', vartrue($_POST['news_sticky'])).$frm->label(LAN_NEWS_29, 'news_sticky', '1')."
+ ".$frm->checkbox('news_sticky', '1', vartrue($_POST['news_sticky']), array('label' => LAN_NEWS_29))."
".LAN_NEWS_30."
@@ -2388,7 +2387,7 @@ class admin_newspost
// ".$frm->admin_button('preview', isset($_POST['preview']) ? NWSLAN_24 : NWSLAN_27 , 'other')."
$text .= $frm->admin_button('submit_news', ($id && $sub_action != "sn" && $sub_action != "upload") ? NWSLAN_25 : NWSLAN_26 , 'update')."
- ".$frm->checkbox('create_edit_stay', 1, isset($_POST['create_edit_stay'])).$frm->label(LAN_NEWS_54, 'create_edit_stay', 1)."
+ ".$frm->checkbox('create_edit_stay', 1, isset($_POST['create_edit_stay']), array('label' => LAN_NEWS_54))."
|