Merge branch 'v11' of gitlab.com:composr-foundation/composr into v11

sources_custom/miniblocks/cms_homesite_download.php

@@ -15,6 +15,7 @@
 
 i_solemnly_declare(I_UNDERSTAND_SQL_INJECTION | I_UNDERSTAND_XSS | I_UNDERSTAND_PATH_INJECTION);
 
+if (!class_exists('Miniblock_cms_homesite_download')) {
     class Miniblock_cms_homesite_download
     {
 
@@ -140,6 +141,7 @@ class Miniblock_cms_homesite_download
             return $ret;
         }
     }
+}
 
 $miniblock = new Miniblock_cms_homesite_download();
 return $miniblock->run();

sources_custom/miniblocks/cms_homesite_make_upgrader.php

@@ -15,6 +15,7 @@
 
 i_solemnly_declare(I_UNDERSTAND_SQL_INJECTION | I_UNDERSTAND_XSS | I_UNDERSTAND_PATH_INJECTION);
 
+if (!class_exists('Miniblock_cms_homesite_make_upgrader')) {
     class Miniblock_cms_homesite_make_upgrader
     {
         /**
@@ -164,6 +165,7 @@ class Miniblock_cms_homesite_make_upgrader
             echo '<label for="upgrade-file">Upgrade file:</label> <input id="upgrade-file" class="notranslate" size="45" readonly="readonly" type="text" value="' . escape_html($url) . '" />, or <a href="' . escape_html($url) . '">download upgrade directly</a> (' . escape_html(clean_file_size(filesize($path))) . ').';
         }
     }
+}
 
 $miniblock = new Miniblock_cms_homesite_make_upgrader();
 return $miniblock->run($map);