blocks/rss_client: MDL-13932 fix config_shownumentries typo

This caused incorrect rules/defaults to be added

Also add client side validation of the number

diff --git a/blocks/rss_client/edit_form.php b/blocks/rss_client/edit_form.php
index 23980d5f4e91fd7dd5c97e05ccb165dc67176377..e84397e789e6efe8b09d63e9e80ffe8d4e869271 100644 (file)
--- a/blocks/rss_client/edit_form.php
+++ b/blocks/rss_client/edit_form.php
@@ -40,11 +40,12 @@ class block_rss_client_edit_form extends block_edit_form {
         $mform->setDefault('config_display_description', 0);
 
         $mform->addElement('text', 'config_shownumentries', get_string('shownumentrieslabel', 'block_rss_client'), array('size' => 5));
-        $mform->setType('config_text', PARAM_INTEGER);
+        $mform->setType('config_shownumentries', PARAM_INTEGER);
+        $mform->addRule('config_shownumentries', null, 'numeric', null, 'client');
         if (!empty($CFG->block_rss_client_num_entries)) {
-            $mform->setDefault('config_text', $CFG->block_rss_client_num_entries);
+            $mform->setDefault('config_shownumentries', $CFG->block_rss_client_num_entries);
         } else {
-            $mform->setDefault('config_text', 5);
+            $mform->setDefault('config_shownumentries', 5);
         }
 
         $rssfeeds = $DB->get_records_sql_menu('