Merge "Bug 1558246: Reset default group page shared settings"

htdocs/blocktype/groupviews/db/upgrade.php

@@ -50,5 +50,26 @@ function xmldb_blocktype_groupviews_upgrade($oldversion=0) {
         }
     }
 
+    if ($oldversion < 2016032300) {
+
+        // Get the group view block from the default group home page view.
+        $sql = "SELECT bi.id, bi.configdata
+                  FROM {block_instance} bi
+            INNER JOIN {view} v ON v.id = bi.view
+                 WHERE bi.blocktype = 'groupviews'
+                       AND v.type = 'grouphomepage'
+                       AND v.owner = 0";
+        $defaultgrouppage = get_record_sql($sql, array());
+
+        if ($defaultgrouppage) {
+            log_debug("Processing default 'Group page' block to set the right shared pages/collections configurations");
+
+            $configdata = unserialize($defaultgrouppage->configdata);
+            $configdata['showsharedviews'] = 1;
+            $configdata['showsharedcollections'] = 1;
+            set_field('block_instance', 'configdata', serialize($configdata), 'id', $defaultgrouppage->id);
+        }
+    }
+
     return true;
 }

htdocs/blocktype/groupviews/version.php

@@ -13,5 +13,5 @@
 defined('INTERNAL') || die();
 
 $config = new StdClass;
-$config->version = 2015090300;
-$config->release = '1.0.2';
+$config->version = 2016032300;
+$config->release = '1.0.3';