From 9d96c6d43595657ff348cca87036c985c039db39 Mon Sep 17 00:00:00 2001 From: Gerhard Schlager Date: Fri, 29 Jan 2016 21:35:16 +0100 Subject: [PATCH 1/2] Prepare settings file for Docker based phpBB3 importer --- script/import_scripts/phpbb3/settings.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/script/import_scripts/phpbb3/settings.yml b/script/import_scripts/phpbb3/settings.yml index d7ee6174e23..279900feeff 100644 --- a/script/import_scripts/phpbb3/settings.yml +++ b/script/import_scripts/phpbb3/settings.yml @@ -16,8 +16,9 @@ import: # This is the path to the root directory of your current phpBB installation (or a copy of it). # The importer expects to find the /files and /images directories within the base directory. + # You need to change this to something like /var/www/phpbb if you are not using the Docker based importer. # This is only needed if you want to import avatars, attachments or custom smilies. - phpbb_base_dir: /var/www/phpbb + phpbb_base_dir: /shared/import/data site_prefix: # this is needed for rewriting internal links in posts From 15165440e5cd7e8379a2a8198394d6e6385684ba Mon Sep 17 00:00:00 2001 From: Gerhard Schlager Date: Thu, 4 Feb 2016 20:39:42 +0100 Subject: [PATCH 2/2] Map :-) to :slightly_smiling: during phpBB3 import --- script/import_scripts/phpbb3/support/smiley_processor.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/import_scripts/phpbb3/support/smiley_processor.rb b/script/import_scripts/phpbb3/support/smiley_processor.rb index 1737e446ce9..0b0785fd3f6 100644 --- a/script/import_scripts/phpbb3/support/smiley_processor.rb +++ b/script/import_scripts/phpbb3/support/smiley_processor.rb @@ -28,7 +28,7 @@ module ImportScripts::PhpBB3 def add_default_smilies { [':D', ':-D', ':grin:'] => ':smiley:', - [':)', ':-)', ':smile:'] => ':smile:', + [':)', ':-)', ':smile:'] => ':slightly_smiling:', [';)', ';-)', ':wink:'] => ':wink:', [':(', ':-(', ':sad:'] => ':frowning:', [':o', ':-o', ':eek:'] => ':astonished:',