moved two more deprecated functions out of the main libs

git-svn-id: http://code.elgg.org/elgg/trunk@8945 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/lib/deprecated-1.7.php b/engine/lib/deprecated-1.7.php
index 7d73fd010b4f9fd46d2d9490fd652d5279f779eb..519eea89d25eb7e0332c7cb76a0e6097125c8097 100644 (file)
--- a/engine/lib/deprecated-1.7.php
+++ b/engine/lib/deprecated-1.7.php
@@ -1125,4 +1125,38 @@ function make_register_object($register_name, $register_value, $children_array =
        $register->children = $children_array;
 
        return $register;
+}
+
+/**
+ * THIS FUNCTION IS DEPRECATED.
+ *
+ * Delete a object's extra data.
+ *
+ * @todo - this should be removed - was deprecated in 1.5 or earlier
+ *
+ * @param int $guid GUID
+ *
+ * @return 1
+ */
+function delete_object_entity($guid) {
+       system_message(elgg_echo('deprecatedfunction', array('delete_user_entity')));
+
+       return 1; // Always return that we have deleted one row in order to not break existing code.
+}
+
+/**
+ * THIS FUNCTION IS DEPRECATED.
+ *
+ * Delete a user's extra data.
+ *
+ * @todo remove
+ *
+ * @param int $guid User GUID
+ *
+ * @return 1
+ */
+function delete_user_entity($guid) {
+       system_message(elgg_echo('deprecatedfunction', array('delete_user_entity')));
+
+       return 1; // Always return that we have deleted one row in order to not break existing code.
 }
\ No newline at end of file

diff --git a/engine/lib/objects.php b/engine/lib/objects.php
index 8819a109448a596564f07415100b7f73ca23552f..b138d6888dba844537ed8457aa7b0f60b2d57604 100644 (file)
--- a/engine/lib/objects.php
+++ b/engine/lib/objects.php
@@ -77,23 +77,6 @@ function create_object_entity($guid, $title, $description) {
        return false;
 }
 
-/**
- * THIS FUNCTION IS DEPRECATED.
- *
- * Delete a object's extra data.
- *
- * @todo - this should be removed - was deprecated in 1.5 or earlier
- *
- * @param int $guid GUID
- *
- * @return 1
- */
-function delete_object_entity($guid) {
-       system_message(elgg_echo('deprecatedfunction', array('delete_user_entity')));
-
-       return 1; // Always return that we have deleted one row in order to not break existing code.
-}
-
 /**
  * Get the sites this object is part of
  *

diff --git a/engine/lib/users.php b/engine/lib/users.php
index 243334e2a7c3509879844d6c480451948e8ac1b6..dcec36ba5d0398b1e76ff9d5cc6d03fbc884b5f5 100644 (file)
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -283,23 +283,6 @@ function remove_user_admin($user_guid) {
        return FALSE;
 }
 
-/**
- * THIS FUNCTION IS DEPRECATED.
- *
- * Delete a user's extra data.
- *
- * @todo remove
- *
- * @param int $guid User GUID
- *
- * @return 1
- */
-function delete_user_entity($guid) {
-       system_message(elgg_echo('deprecatedfunction', array('delete_user_entity')));
-
-       return 1; // Always return that we have deleted one row in order to not break existing code.
-}
-
 /**
  * Get the sites this user is part of
  *