"MDL-21122, fixed saving setting problem in section links block, merged from 1.9"

diff --git a/blocks/section_links/block_section_links.php b/blocks/section_links/block_section_links.php
index 200fbbd1d5db6534623606f79d965f44e5669354..8d87f070ef4fccd64904beadba7330c6dd2bcd35 100644 (file)
--- a/blocks/section_links/block_section_links.php
+++ b/blocks/section_links/block_section_links.php
@@ -73,7 +73,7 @@ class block_section_links extends block_base {
         }
 
         if(!empty($config->numsections2) and ($course->numsections > $config->numsections2)) {
-            $inc = $config->incby1;
+            $inc = $config->incby2;
         } else {
             if ($course->numsections > 40) {
                 $inc = 5;

diff --git a/blocks/section_links/config_instance.html b/blocks/section_links/config_instance.html
index 38c447388b5e750b0b68f60d9105a8ed0406da25..9ccd6ace1ae8c0bac79c1a547a811c85b17d1748 100755 (executable)
--- a/blocks/section_links/config_instance.html
+++ b/blocks/section_links/config_instance.html
@@ -18,7 +18,7 @@ if(isset($this->config)){
 
 $selected = array();
 if (!empty($config->numsections1)) {
-    if (!empty($config->incby1)) {
+    if (empty($config->incby1)) {
         $config->incby1 = 2;
     }
     $selected[1] = array($config->numsections1, $config->incby1);
@@ -27,7 +27,7 @@ if (!empty($config->numsections1)) {
 }
 
 if (!empty($config->numsections2)) {
-    if (!empty($config->incby1)) {
+    if (empty($config->incby1)) {
         $config->incby1 = 5;
     }
     $selected[2] = array($config->numsections2, $config->incby2);