User: dman Branch: DRUPAL-6--1 Date: Wed, 23 Feb 2011 11:39:51 +0000 Modified files: /modules/import_html/coders_php_library xml-transform.inc /modules/import_html/extras README.txt /modules/import_html import_html.module import_html_modules.inc import_html_process.inc import_html_ui.inc /modules/import_html/modules core.inc /modules/import_html rewrite_href_and_src.xsl Log message: Repair for teaser generation so it doesn't get doubled up. new 'overwrite unless modified' option for re-import conflict resolution. Actual full support for creating revisions with the desired user, not the current one. Core oddness prevented the expected behavior. changed func signature for hook_import_html_node_merge(). Tidied some messages Links: http://cvs.drupal.org/diff.php?path=contributions/modules/import_html/coders... http://cvs.drupal.org/diff.php?path=contributions/modules/import_html/extras... http://cvs.drupal.org/diff.php?path=contributions/modules/import_html/import... http://cvs.drupal.org/diff.php?path=contributions/modules/import_html/import... http://cvs.drupal.org/diff.php?path=contributions/modules/import_html/import... http://cvs.drupal.org/diff.php?path=contributions/modules/import_html/import... http://cvs.drupal.org/diff.php?path=contributions/modules/import_html/module... http://cvs.drupal.org/diff.php?path=contributions/modules/import_html/rewrit...