Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-04-04-00-08-28

[civicrm-core.git] / api / v3 / Website.php

diff --git a/api/v3/Website.php b/api/v3/Website.php
index ed7f52dbe521a5579050cad6b0b590c7a3691234..cc444c5864035ff930a9bec8015f519096e5ed47 100644 (file)
--- a/api/v3/Website.php
+++ b/api/v3/Website.php
@@ -1,11 +1,10 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.3                                                |
+ | CiviCRM version 4.5                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -33,12 +32,10 @@
  * @package CiviCRM_APIv3
  * @subpackage API_Website
  *
- * @copyright CiviCRM LLC (c) 2004-2013
+ * @copyright CiviCRM LLC (c) 2004-2014
  * @version $Id: Website.php 2011-03-16 ErikHommel $
  */
 
-require_once 'CRM/Core/BAO/Website.php';
-
 /**
  *  Add an Website for a contact
  *
@@ -58,9 +55,9 @@ function civicrm_api3_website_create($params) {
     $values = array();
     _civicrm_api3_object_to_array($websiteBAO, $values[$websiteBAO->id]);
     return civicrm_api3_create_success($values, $params, 'website', 'get');
+}
 
-  }
-/*
+/**
  * Adjust Metadata for Create action
  *
  * The metadata is used for setting defaults, documentation & validation
@@ -112,6 +109,6 @@ function civicrm_api3_website_delete($params) {
  * @access public
  */
 function civicrm_api3_website_get($params) {
-  return _civicrm_api3_basic_get(_civicrm_api3_get_BAO(__FUNCTION__), $params);
+  return _civicrm_api3_basic_get(_civicrm_api3_get_BAO(__FUNCTION__), $params, TRUE, 'website');
 }