diff options
| -rw-r--r-- | engine/lib/users.php | 2 | ||||
| -rw-r--r-- | languages/en.php | 6 | ||||
| -rw-r--r-- | mod/friends/languages/en.php | 15 | ||||
| -rw-r--r-- | mod/friends/manifest.xml | 11 | ||||
| -rw-r--r-- | mod/friends/start.php | 14 | ||||
| -rw-r--r-- | views/default/widgets/friends/content.php (renamed from mod/friends/views/default/widgets/friends/content.php) | 0 | ||||
| -rw-r--r-- | views/default/widgets/friends/edit.php (renamed from mod/friends/views/default/widgets/friends/edit.php) | 0 | 
7 files changed, 8 insertions, 40 deletions
diff --git a/engine/lib/users.php b/engine/lib/users.php index 61ea58b29..076f7b9f7 100644 --- 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 b89124c6c..34c141a5b 100644 --- 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 index 1d09cfca6..000000000 --- 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 index 8cdd8c6bd..000000000 --- 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 index 54675ee2f..000000000 --- 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 index 2f9ab71ea..2f9ab71ea 100644 --- a/mod/friends/views/default/widgets/friends/content.php +++ b/views/default/widgets/friends/content.php diff --git a/mod/friends/views/default/widgets/friends/edit.php b/views/default/widgets/friends/edit.php index 9a6499ede..9a6499ede 100644 --- a/mod/friends/views/default/widgets/friends/edit.php +++ b/views/default/widgets/friends/edit.php  | 
