Add $viewconfig parameter to import_create_blockinstance, rename the other parameter.

We pass through the view config as well so that the importing methods
can look at the view owner, among other things it might want to look at.
Signed-off-by: Nigel McNie <nigel@catalyst.net.nz>

htdocs/blocktype/lib.php

@@ -314,26 +314,19 @@ abstract class PluginBlocktype extends Plugin {
     /**
      * Creates a block instance from a given configuration.
      *
-     * The configuration is whatever was generated by {@link 
-     * export_blockinstance_config()}. This method doesn't have to worry about 
+     * The configuration is whatever was generated by {@link
+     * export_blockinstance_config()}. This method doesn't have to worry about
      * setting the block title, or the position in the View.
      *
-     * @param array $config The config to use to create the blockinstance
+     * @param array $biconfig   The config to use to create the blockinstance
+     * @param array $viewconfig The configuration for the view being imported
      * @return BlockInstance The new block instance
      */
-    public static function import_create_blockinstance(array $config) {
-        // TODO: a default implementation might just create a new blockinstance 
-        // with the config shunted into configdata - but with artefactids 
-        // replaced with new ones
-        //
-        // TODO: unsetting these for now, will want them to be references to 
-        // artefacts in the export
-        unset($config['config']['artefactid']);
-        if (isset($config['config']['artefactids'])) $config['config']['artefactids'] = array();
+    public static function import_create_blockinstance(array $biconfig, array $viewconfig) {
         $bi = new BlockInstance(0,
             array(
-                'blocktype'  => $config['type'],
-                'configdata' => $config['config'],
+                'blocktype'  => $biconfig['type'],
+                'configdata' => $biconfig['config'],
             )
         );