rework controls to accept parameters as array

1 files changed, 7 insertions, 8 deletions

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 636f2d69b..ce2d321bd 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -644,8 +644,10 @@ class Pref_Feeds extends Handler_Protected {
 				$local_purge_intervals = [ T_nsprintf('%d day', '%d days', $purge_interval, $purge_interval) ];
 			}
 
-			print \Controls\select_hash("purge_interval", $purge_interval, $local_purge_intervals,
-				((FORCE_ARTICLE_PURGE == 0) ? "" : 'disabled="1"'));
+			print \Controls\select_hash("purge_interval",
+										$purge_interval,
+										$local_purge_intervals,
+										(FORCE_ARTICLE_PURGE == 0) ? [] : ["disabled" => 1]);
 
 			print "</fieldset>";
 
@@ -815,8 +817,6 @@ class Pref_Feeds extends Handler_Protected {
 
 		print_notice("Enable the options you wish to apply using checkboxes on the right:");
 
-		print "<p>";
-
 		print \Controls\hidden_tag("ids", "$feed_ids");
 		print \Controls\hidden_tag("op", "pref-feeds");
 		print \Controls\hidden_tag("method", "batchEditSave");
@@ -846,8 +846,7 @@ class Pref_Feeds extends Handler_Protected {
 			print "<fieldset>";
 
 			print "<label>" . __('Language:') . "</label> ";
-			print \Controls\select_tag("feed_language", "", $this::get_ts_languages(),
-				'disabled="1"');
+			print \Controls\select_tag("feed_language", "", $this::get_ts_languages(), ["disabled"=> 1]);
 
 			$this->batch_edit_cbox("feed_language");
 
@@ -868,7 +867,7 @@ class Pref_Feeds extends Handler_Protected {
 		$local_update_intervals = $update_intervals;
 		$local_update_intervals[0] .= sprintf(" (%s)", $update_intervals[get_pref("DEFAULT_UPDATE_INTERVAL")]);
 
-		print \Controls\select_hash("update_interval", "", $local_update_intervals, 'disabled="1"');
+		print \Controls\select_hash("update_interval", "", $local_update_intervals, ["disabled" => 1]);
 
 		$this->batch_edit_cbox("update_interval");
 
@@ -890,7 +889,7 @@ class Pref_Feeds extends Handler_Protected {
 			else
 				$local_purge_intervals[0] .= " " . sprintf("(%s)", __("Disabled"));
 
-			print \Controls\select_hash("purge_interval", "", $local_purge_intervals, 'disabled="1"');
+			print \Controls\select_hash("purge_interval", "", $local_purge_intervals, ["disabled" => 1]);
 
 			$this->batch_edit_cbox("purge_interval");