mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into calendar_sharing

This commit is contained in:
Georg Ehrke 2012-03-26 09:50:39 +02:00
parent b7a5ae38c5 102cf150b3
commit 96dd008f5e
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.htaccess
View File

@ -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

4
apps/contacts/lib/vcard.php
View File

@ -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);
}
/**

15
core/templates/403.php Normal file
View File

@ -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>