[php-blog-cvs] serendipity/include/admin/importers movabletype.inc.php,1.1.2.2,1.1.2.3 wordpress.inc.php,1.1.2.2,1.1.2.3

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/include/admin/importers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19849/include/admin/importers

Modified Files:
      Tag: branch-smarty
	movabletype.inc.php wordpress.inc.php 
Log Message:
* Fixed double 'style' emitting of XML icons
* Added "no autodiscovery/trackbacks" option to native import


Index: wordpress.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/importers/Attic/wordpress.inc.php,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- wordpress.inc.php	16 Nov 2004 11:39:00 -0000	1.1.2.2
+++ wordpress.inc.php	17 Nov 2004 11:33:50 -0000	1.1.2.3
@@ -30,7 +30,13 @@
 
                                    array('text' => INSTALL_DBPREFIX,
                                          'type' => 'input',
-                                         'name' => 'prefix'));
+                                         'name' => 'prefix'),
+
+                                   array('text'    => ACTIVATE_AUTODISCOVERY,
+                                         'type'    => 'bool',
+                                         'name'    => 'autodiscovery',
+                                         'default' => 'false')
+                            );
     }
 
     function validateData() {
@@ -44,6 +50,10 @@
     function import() {
         global $serendipity;
 
+        if ($this->data['autodiscovery'] == 'false') {
+            $serendipity['noautodiscovery'] = 1;
+        }
+
         $this->data['prefix'] = serendipity_db_escape_string($this->data['prefix']);
         $users = array();
         $categories = array();

Index: movabletype.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/importers/Attic/movabletype.inc.php,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- movabletype.inc.php	16 Nov 2004 11:39:00 -0000	1.1.2.2
+++ movabletype.inc.php	17 Nov 2004 11:33:50 -0000	1.1.2.3
@@ -18,7 +18,13 @@
                                    array('text'    => FORCE,
                                          'type'    => 'bool',
                                          'name'    => 'mt_force',
-                                         'default' => 'true'));
+                                         'default' => 'true'),
+
+                                   array('text'    => ACTIVATE_AUTODISCOVERY,
+                                         'type'    => 'bool',
+                                         'name'    => 'autodiscovery',
+                                         'default' => 'false')
+                            );
     }
 
     function validateData() {
@@ -33,6 +39,11 @@
         global $serendipity;
 
         $force    = ($this->data['force'] == 'true');
+
+        if ($this->data['autodiscovery'] == 'false') {
+            $serendipity['noautodiscovery'] = 1;
+        }
+
         $contents = file_get_contents($serendipity['FILES']['tmp_name']['mt_dat']);
 
         $authors    = array();