From 01726847194123bf9417516dbdbbbc41fdc7bc47 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Tue, 1 Mar 2016 10:20:27 +0800
Subject: [PATCH] Some fixes for phpbb importer.

---
 script/import_scripts/phpbb3/importer.rb               |  5 ++++-
 .../import_scripts/phpbb3/importers/user_importer.rb   | 10 ++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/script/import_scripts/phpbb3/importer.rb b/script/import_scripts/phpbb3/importer.rb
index ffcccae7bd1..9f88a73b2b4 100644
--- a/script/import_scripts/phpbb3/importer.rb
+++ b/script/import_scripts/phpbb3/importer.rb
@@ -111,7 +111,10 @@ module ImportScripts::PhpBB3
     # uncomment below lines to create permalink for categories
     # def create_category(opts, import_id)
     #   new_category = super
-    #   Permalink.create(url: "viewforum.php?f=#{import_id}", category_id: new_category.id)
+    #   url = "viewforum.php?f=#{import_id}"
+    #   if !Permalink.find_by(url: url)
+    #     Permalink.create(url: url, category_id: new_category.id)
+    #   end
     #   new_category
     # end
 
diff --git a/script/import_scripts/phpbb3/importers/user_importer.rb b/script/import_scripts/phpbb3/importers/user_importer.rb
index f1958ef147f..ca50197a95d 100644
--- a/script/import_scripts/phpbb3/importers/user_importer.rb
+++ b/script/import_scripts/phpbb3/importers/user_importer.rb
@@ -91,10 +91,12 @@ module ImportScripts::PhpBB3
       end
 
       if disable_email
-        user.email_digests = false
-        user.email_private_messages = false
-        user.email_direct = false
-        user.email_always = false
+        user_option = user.user_option
+        user_option.email_digests = false
+        user_option.email_private_messages = false
+        user_option.email_direct = false
+        user_option.email_always = false
+        user_option.save!
       end
 
       if user.save