aboutsummaryrefslogtreecommitdiff
path: root/app/Controllers/userController.php
diff options
context:
space:
mode:
Diffstat (limited to 'app/Controllers/userController.php')
-rw-r--r--app/Controllers/userController.php16
1 files changed, 15 insertions, 1 deletions
diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php
index 6afc91b4e..7ce6b298a 100644
--- a/app/Controllers/userController.php
+++ b/app/Controllers/userController.php
@@ -248,7 +248,21 @@ class FreshRSS_user_Controller extends Minz_ActionController {
}
if ($ok) {
$newUserDAO = FreshRSS_Factory::createUserDao($new_user_name);
- $ok &= $newUserDAO->createUser($insertDefaultFeeds);
+ $ok &= $newUserDAO->createUser();
+
+ if ($ok && $insertDefaultFeeds) {
+ $opmlPath = DATA_PATH . '/opml.xml';
+ if (!file_exists($opmlPath)) {
+ $opmlPath = FRESHRSS_PATH . '/opml.default.xml';
+ }
+ $importController = new FreshRSS_importExport_Controller();
+ try {
+ $importController->importFile($opmlPath, $opmlPath, $new_user_name);
+ } catch (Exception $e) {
+ Minz_Log::error('Error while importing default OPML for user ' . $new_user_name . ': ' . $e->getMessage());
+ }
+ }
+
$ok &= self::updateUser($new_user_name, $email, $passwordPlain, $apiPasswordPlain);
}
return $ok;