From 0129e590241ae984faf097a3d4513ac7e46d6f8b Mon Sep 17 00:00:00 2001
From: jbtbnl <jbtbnl@users.noreply.github.com>
Date: Tue, 26 Aug 2014 19:28:45 +0200
Subject: [PATCH] Hide upload iframe and fix merge flaws

---
 css/contacts.css                    | 31 +++++++++++++++++------------
 lib/controller/importcontroller.php |  2 +-
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/css/contacts.css b/css/contacts.css
index 92b5d77d..2576e0f9 100644
--- a/css/contacts.css
+++ b/css/contacts.css
@@ -87,6 +87,7 @@
 #app-navigation li.active[data-type="category"] > .utils > * {
 	display: inline-block;
 	float: left;
+	background-color: rgba(0,0,0,0);
 }
 #app-navigation li > .utils > .numcontacts {
 	padding-right: 5px;
@@ -865,26 +866,30 @@ tbody tr.contact.active, tbody tr.contact:hover {
 	display: inline-block;
 }
 
+#file_upload_target {
+	display: none;
+}
+
 @media screen and (min-width: 1201px) {
-#contactlist tr td.categories { display: none; }
-#contactsHeader tr td.categories { display: none; }
+	#contactlist tr td.categories { display: none; }
+	#contactsHeader tr td.categories { display: none; }
 }
 @media screen and (max-width: 1200px) {
-#contactlist tr td.adr { display: none; }
-#contactsHeader tr td.adr { display: none; }
-.multiselect #contactsHeader { margin-left: 300px; padding-right: 300px; }
+	#contactlist tr td.adr { display: none; }
+	#contactsHeader tr td.adr { display: none; }
+	.multiselect #contactsHeader { margin-left: 300px; padding-right: 300px; }
 }
 @media screen and (max-width: 1000px) {
-#contactlist tr td.tel { display: none; }
-#contactsHeader tr td.tel { display: none; }
-.multiselect #contactsHeader { margin-left: 280px; padding-right: 280px; }
+	#contactlist tr td.tel { display: none; }
+	#contactsHeader tr td.tel { display: none; }
+	.multiselect #contactsHeader { margin-left: 280px; padding-right: 280px; }
 }
 @media screen and (max-width: 900px) {
-#contactsHeader .delete { display: none; }
+	#contactsHeader .delete { display: none; }
 }
 @media screen and (max-width: 800px) {
-#contactlist tr td.email { display: none; }
-#contactlist tr { width: 100%; }
-#contactsHeader tr td.email { display: none; }
-.multiselect #contactsHeader { margin-left: 250px; padding-right: 250px; }
+	#contactlist tr td.email { display: none; }
+	#contactlist tr { width: 100%; }
+	#contactsHeader tr td.email { display: none; }
+	.multiselect #contactsHeader { margin-left: 250px; padding-right: 250px; }
 }
diff --git a/lib/controller/importcontroller.php b/lib/controller/importcontroller.php
index 1a716f83..721f8be6 100644
--- a/lib/controller/importcontroller.php
+++ b/lib/controller/importcontroller.php
@@ -248,7 +248,7 @@ class ImportController extends Controller {
 						foreach ($favourites as $favourite) {
 							if ($favourite->getValue() == 'yes') {
 								$tagMgr = \OC::$server->getTagManager()->load('contact');
-								$this->tags->addToFavorites($id);
+								$tagMgr->addToFavorites($id);
 							}
 						}
 					} else {