From ec40f69c9e7a6aba39bd74ff1549e70a93357e4f Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 25 Mar 2012 14:16:39 +0200
Subject: [PATCH 1/2] add error 403 site

---
 .htaccess              |  1 +
 core/templates/403.php | 15 +++++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 core/templates/403.php

diff --git a/.htaccess b/.htaccess
index ebb28b0887..11520d743d 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,3 +1,4 @@
+ErrorDocument 403 /core/templates/403.php
 ErrorDocument 404 /core/templates/404.php
 <IfModule mod_php5.c>
 php_value upload_max_filesize 512M
diff --git a/core/templates/403.php b/core/templates/403.php
new file mode 100644
index 0000000000..cdfef08ac7
--- /dev/null
+++ b/core/templates/403.php
@@ -0,0 +1,15 @@
+<?php
+if(!isset($_)){//also provide standalone error page
+	require_once '../../lib/base.php';
+	
+	$tmpl = new OC_Template( '', '403', 'guest' );
+	$tmpl->printPage();
+	exit;
+}
+?>
+<ul>
+	<li class='error'>
+		<?php echo $l->t( 'Access forbidden' ); ?><br/>
+		<p class='hint'><?php if(isset($_['file'])) echo $_['file']?></p>
+	</li>
+</ul>

From 102cf150b3a1de43877878debf9aef5f386d543b Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 26 Mar 2012 02:04:34 +0200
Subject: [PATCH 2/2] Fixed error in OC_Contacts_VCard::addFromDAVData as
 pointed out by Guillaume ZITTA

---
 apps/contacts/lib/vcard.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index 3736f18c64..15a6176d40 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -228,7 +228,7 @@ class OC_Contacts_VCard{
 	 * @param string $uri the uri of the card, default based on the UID
 	 * @return insertid on success or null if no card.
 	 */
-	public static function add($aid, $card, $uri=null){
+	public static function add($aid, OC_VObject $card, $uri=null){
 		if(is_null($card)){
 			OC_Log::write('contacts','OC_Contacts_VCard::add. No vCard supplied', OC_Log::ERROR);
 			return null;
@@ -267,7 +267,7 @@ class OC_Contacts_VCard{
 	 */
 	public static function addFromDAVData($id,$uri,$data){
 		$card = OC_VObject::parse($data);
-		return self::add($id, $data, $uri);
+		return self::add($id, $card, $uri);
 	}
 
 	/**