Merge remote-tracking branch 'upstream/master'

[quix0rs-gnu-social.git] / plugins / YammerImport / lib / yammerimporter.php

diff --git a/plugins/YammerImport/lib/yammerimporter.php b/plugins/YammerImport/lib/yammerimporter.php
index 6af0302f7749f7d3e420c4181493c27fdcac7587..abd41dd99e271028e44acdf54d1524e5fd8e6695 100644 (file)
--- a/plugins/YammerImport/lib/yammerimporter.php
+++ b/plugins/YammerImport/lib/yammerimporter.php
@@ -161,9 +161,13 @@ class YammerImporter
             // Save "likes" as favorites...
             foreach ($data['faves'] as $nickname) {
                 $user = User::getKV('nickname', $nickname);
-
                 if ($user instanceof User) {
-                    Fave::addNew($user->getProfile(), $notice);
+                    try {
+                        Fave::addNew($user->getProfile(), $notice);
+                    } catch (Exception $e) {
+                        // failed, let's move to the next
+                        common_debug('YammerImport failed favoriting a notice: '.$e->getMessage());
+                    }
                 }
             }