moved friends widget into core

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

diff --git a/engine/lib/users.php b/engine/lib/users.php
index 61ea58b2970df0e09989b25d3dffee8a528645a2..076f7b9f7e1d482666c3dc5c1f6c7cdbf3deff98 100644 (file)
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -1542,6 +1542,8 @@ function users_init() {
        elgg_register_action("user/passwordreset", '', 'public');
        elgg_register_action("user/requestnewpassword", '', 'public');
 
+       elgg_register_widget_type('friends', elgg_echo("friends"), elgg_echo('friends:widget:description'));
+
        // User name change
        extend_elgg_settings_page('user/settings/name', 'usersettings/user', 1);
        //elgg_register_action("user/name");

diff --git a/languages/en.php b/languages/en.php
index b89124c6c92b3afb8d61c52023d1989a45ad67e4..34c141a5beaa801c6c35a9cdbc3a87e4c09fc879 100644 (file)
--- a/languages/en.php
+++ b/languages/en.php
@@ -646,6 +646,12 @@ $english = array(
        'members:title:searchname' => 'Member search for %s',
        'members:title:searchtag' => 'Members tagged with %s',
 
+       'friends:widget:description' => "Displays some of your friends.",
+       'friends:num_display' => "Number of friends to display",
+       'friends:icon_size' => "Icon size",
+       'friends:tiny' => "tiny",
+       'friends:small' => "small",
+
 /**
  * Generic action words
  */

diff --git a/mod/friends/languages/en.php b/mod/friends/languages/en.php
deleted file mode 100644 (file)
index 1d09cfc..0000000
--- a/mod/friends/languages/en.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-$english = array(
-
-       /**
-        * Friends widget
-        */
-       'friends:widget:description' => "Displays some of your friends.",
-       'friends:num_display' => "Number of friends to display",
-       'friends:icon_size' => "Icon size",
-       'friends:tiny' => "tiny",
-       'friends:small' => "small",
-);
-
-add_translation("en", $english);

diff --git a/mod/friends/manifest.xml b/mod/friends/manifest.xml
deleted file mode 100644 (file)
index 8cdd8c6..0000000
--- a/mod/friends/manifest.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin_manifest>
-       <field key="author" value="Curverider ltd" />
-       <field key="version" value="1.7" />
-       <field key="description" value="Provides friend widgets for your profile" />
-       <field key="website" value="http://www.elgg.org/" />
-       <field key="copyright" value="(c) Curverider 2008-2010" />
-       <field key="licence" value="GNU Public License version 2" />
-       <field key="elgg_version" value="2010030101" />
-       <field key="admin_interface" value="simple" />
-</plugin_manifest>

diff --git a/mod/friends/start.php b/mod/friends/start.php
deleted file mode 100644 (file)
index 54675ee..0000000
--- a/mod/friends/start.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-/**
- * Elgg Friends widget
- * This plugin allows users to put a list of their friends on their profile
- *
- * @package ElggFriends
- */
-
-function friends_init() {
-       elgg_register_widget_type('friends', elgg_echo("friends"), elgg_echo('friends:widget:description'));
-}
-
-elgg_register_event_handler('init', 'system', 'friends_init');

diff --git a/mod/friends/views/default/widgets/friends/content.php b/views/default/widgets/friends/content.php
similarity index 100%
rename from mod/friends/views/default/widgets/friends/content.php
rename to views/default/widgets/friends/content.php

diff --git a/mod/friends/views/default/widgets/friends/edit.php b/views/default/widgets/friends/edit.php
similarity index 100%
rename from mod/friends/views/default/widgets/friends/edit.php
rename to views/default/widgets/friends/edit.php