Fixes #4211 removes calendar library

diff --git a/engine/lib/calendar.php b/engine/lib/deprecated-1.9.php
similarity index 95%
rename from engine/lib/calendar.php
rename to engine/lib/deprecated-1.9.php
index 9a06c52921c74989f16f25e78c5f39274838cd64..31d03428fbe483a3f3ff28ee27213835b57ae991 100644 (file)
--- a/engine/lib/calendar.php
+++ b/engine/lib/deprecated-1.9.php
@@ -1,13 +1,4 @@
 <?php
-/**
- * Elgg calendar / entity / event functions.
- *
- * @package    Elgg.Core
- * @subpackage Calendar
- *
- * @todo Implement or remove
- */
-
 /**
  * Return a timestamp for the start of a given day (defaults today).
  *
@@ -17,8 +8,10 @@
  *
  * @return int
  * @access private
+ * @deprecated 1.9
  */
 function get_day_start($day = null, $month = null, $year = null) {
+       elgg_deprecated_notice('get_day_start() has been deprecated', 1.9);
        return mktime(0, 0, 0, $month, $day, $year);
 }
 
@@ -31,8 +24,10 @@ function get_day_start($day = null, $month = null, $year = null) {
  *
  * @return int
  * @access private
+ * @deprecated 1.9
  */
 function get_day_end($day = null, $month = null, $year = null) {
+       elgg_deprecated_notice('get_day_end() has been deprecated', 1.9);
        return mktime(23, 59, 59, $month, $day, $year);
 }
 
@@ -53,10 +48,12 @@ function get_day_end($day = null, $month = null, $year = null) {
  *
  * @return array|false
  * @access private
+ * @deprecated 1.9
  */
 function get_notable_entities($start_time, $end_time, $type = "", $subtype = "", $owner_guid = 0,
 $order_by = "asc", $limit = 10, $offset = 0, $count = false, $site_guid = 0,
 $container_guid = null) {
+       elgg_deprecated_notice('get_notable_entities() has been deprecated', 1.9);
        global $CONFIG;
 
        if ($subtype === false || $subtype === null || $subtype === 0) {
@@ -201,10 +198,12 @@ $container_guid = null) {
  *
  * @return int|array A list of entities, or a count if $count is set to true
  * @access private
+ * @deprecated 1.9
  */
 function get_notable_entities_from_metadata($start_time, $end_time, $meta_name, $meta_value = "",
 $entity_type = "", $entity_subtype = "", $owner_guid = 0, $limit = 10, $offset = 0, $order_by = "",
 $site_guid = 0, $count = false) {
+       elgg_deprecated_notice('get_notable_entities_from_metadata() has been deprecated', 1.9);
 
        global $CONFIG;
 
@@ -331,10 +330,12 @@ $site_guid = 0, $count = false) {
  *
  * @return array|int|false An array of entities, or the number of entities, or false on failure
  * @access private
+ * @deprecated 1.9
  */
 function get_noteable_entities_from_relationship($start_time, $end_time, $relationship,
 $relationship_guid, $inverse_relationship = false, $type = "", $subtype = "", $owner_guid = 0,
 $order_by = "", $limit = 10, $offset = 0, $count = false, $site_guid = 0) {
+       elgg_deprecated_notice('get_noteable_entities_from_relationship() has been deprecated', 1.9);
 
        global $CONFIG;
 
@@ -441,9 +442,11 @@ $order_by = "", $limit = 10, $offset = 0, $count = false, $site_guid = 0) {
  *
  * @return array|false
  * @access private
+ * @deprecated 1.9
  */
 function get_todays_entities($type = "", $subtype = "", $owner_guid = 0, $order_by = "",
 $limit = 10, $offset = 0, $count = false, $site_guid = 0, $container_guid = null) {
+       elgg_deprecated_notice('get_todays_entities() has been deprecated', 1.9);
 
        $day_start = get_day_start();
        $day_end = get_day_end();
@@ -468,10 +471,12 @@ $limit = 10, $offset = 0, $count = false, $site_guid = 0, $container_guid = null
  *
  * @return int|array A list of entities, or a count if $count is set to true
  * @access private
+ * @deprecated 1.9
  */
 function get_todays_entities_from_metadata($meta_name, $meta_value = "", $entity_type = "",
 $entity_subtype = "", $owner_guid = 0, $limit = 10, $offset = 0, $order_by = "", $site_guid = 0,
 $count = false) {
+       elgg_deprecated_notice('get_todays_entities_from_metadata() has been deprecated', 1.9);
 
        $day_start = get_day_start();
        $day_end = get_day_end();
@@ -499,10 +504,12 @@ $count = false) {
  *
  * @return array|int|false An array of entities, or the number of entities, or false on failure
  * @access private
+ * @deprecated 1.9
  */
 function get_todays_entities_from_relationship($relationship, $relationship_guid,
 $inverse_relationship = false, $type = "", $subtype = "", $owner_guid = 0,
 $order_by = "", $limit = 10, $offset = 0, $count = false, $site_guid = 0) {
+       elgg_deprecated_notice('get_todays_entities_from_relationship() has been deprecated', 1.9);
 
        $day_start = get_day_start();
        $day_end = get_day_end();
@@ -529,9 +536,11 @@ $order_by = "", $limit = 10, $offset = 0, $count = false, $site_guid = 0) {
  *
  * @return string A viewable list of entities
  * @access private
+ * @deprecated 1.9
  */
 function list_notable_entities($start_time, $end_time, $type= "", $subtype = "", $owner_guid = 0,
 $limit = 10, $fullview = true, $listtypetoggle = false, $navigation = true) {
+       elgg_deprecated_notice('list_notable_entities() has been deprecated', 1.9);
 
        $offset = (int) get_input('offset');
        $count = get_notable_entities($start_time, $end_time, $type, $subtype,
@@ -559,9 +568,11 @@ $limit = 10, $fullview = true, $listtypetoggle = false, $navigation = true) {
  *
  * @return string A viewable list of entities
  * @access private
+ * @deprecated 1.9
  */
 function list_todays_entities($type= "", $subtype = "", $owner_guid = 0, $limit = 10,
 $fullview = true, $listtypetoggle = false, $navigation = true) {
+       elgg_deprecated_notice('list_todays_entities() has been deprecated', 1.9);
 
        $day_start = get_day_start();
        $day_end = get_day_end();

diff --git a/engine/start.php b/engine/start.php
index 454dc7377f56d6eebdf0c0cc8e7b9605a6d052c3..1decc5d800fb2bacdb096eb19186afb20832bc6f 100644 (file)
--- a/engine/start.php
+++ b/engine/start.php
@@ -92,7 +92,7 @@ $lib_files = array(
        // these need to be loaded first.
        'database.php', 'actions.php',
 
-       'admin.php', 'annotations.php', 'calendar.php',
+       'admin.php', 'annotations.php',
        'configuration.php', 'cron.php', 'entities.php', 'export.php',
        'extender.php', 'filestore.php', 'group.php', 
        'location.php', 'mb_wrapper.php', 'memcache.php', 'metadata.php',
@@ -102,8 +102,8 @@ $lib_files = array(
        'statistics.php', 'tags.php', 'user_settings.php', 'users.php',
        'upgrade.php', 'web_services.php', 'widgets.php', 'xml.php',
        
-       //backwards compatibility
-       'deprecated-1.7.php', 'deprecated-1.8.php',
+       // backward compatibility
+       'deprecated-1.7.php', 'deprecated-1.8.php', 'deprecated-1.9.php'
 );
 
 foreach ($lib_files as $file) {

diff --git a/install/ElggInstaller.php b/install/ElggInstaller.php
index 367d23b4dbf0a19f88bc942713f7f89149403477..2070f15e96d5953302e38c11381adebcbf23dd8b 100644 (file)
--- a/install/ElggInstaller.php
+++ b/install/ElggInstaller.php
@@ -780,7 +780,7 @@ class ElggInstaller {
                                'database.php', 'actions.php',
 
                                'admin.php', 'annotations.php',
-                               'calendar.php', 'cron.php', 'entities.php',
+                               'cron.php', 'entities.php',
                                'extender.php', 'filestore.php', 'group.php',
                                'location.php', 'mb_wrapper.php',
                                'memcache.php', 'metadata.php', 'metastrings.php',
@@ -791,7 +791,7 @@ class ElggInstaller {
                                'sites.php', 'statistics.php', 'tags.php', 'user_settings.php',
                                'users.php', 'upgrade.php', 'web_services.php',
                                'widgets.php', 'xml.php', 'deprecated-1.7.php',
-                               'deprecated-1.8.php',
+                               'deprecated-1.8.php', 'deprecated-1.9.php'
                        );
 
                        foreach ($lib_files as $file) {