From a6ab24b467633c72aac740a8aa1ded9d8d0cc0cd Mon Sep 17 00:00:00 2001 From: brettp Date: Sat, 9 Apr 2011 16:19:57 +0000 Subject: Removing odd ? after docblock in twitter_api. git-svn-id: http://code.elgg.org/elgg/trunk@8967 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/twitter_api/lib/twitter_api.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mod') diff --git a/mod/twitter_api/lib/twitter_api.php b/mod/twitter_api/lib/twitter_api.php index 167dbe0f5..0621c2b13 100644 --- a/mod/twitter_api/lib/twitter_api.php +++ b/mod/twitter_api/lib/twitter_api.php @@ -283,7 +283,7 @@ function twitter_api_revoke() { /** * Returns the url to authorize a user. * - * @param string $callback The callback URL? + * @param string $callback The callback URL */ function twitter_api_get_authorize_url($callback = NULL) { global $SESSION; @@ -341,4 +341,4 @@ function twitter_api_allow_new_users_with_twitter() { } return false; -} +} \ No newline at end of file -- cgit v1.2.3 From 5ba7b5810e4075d96943348aa5bba0946ada4755 Mon Sep 17 00:00:00 2001 From: cash Date: Sat, 9 Apr 2011 19:56:01 +0000 Subject: registered bookmarks widget git-svn-id: http://code.elgg.org/elgg/trunk@8973 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/bookmarks/languages/en.php | 3 +-- mod/bookmarks/start.php | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'mod') diff --git a/mod/bookmarks/languages/en.php b/mod/bookmarks/languages/en.php index e3f8cd64f..42865f8cf 100644 --- a/mod/bookmarks/languages/en.php +++ b/mod/bookmarks/languages/en.php @@ -52,8 +52,7 @@ $english = array( /** * Widget and bookmarklet */ - 'bookmarks:widget:description' => - "This widget displays your latest bookmarks.", + 'bookmarks:widget:description' => "Display your latest bookmarks.", 'bookmarks:bookmarklet:description' => "The bookmarks bookmarklet allows you to share any resource you find on the web with your friends, or just bookmark it for yourself. To use it, simply drag the following button to your browser's links bar:", diff --git a/mod/bookmarks/start.php b/mod/bookmarks/start.php index 600293b5a..2dc86bc1a 100644 --- a/mod/bookmarks/start.php +++ b/mod/bookmarks/start.php @@ -35,7 +35,9 @@ function bookmarks_init() { elgg_extend_view('css/elgg', 'bookmarks/css'); elgg_extend_view('js/elgg', 'bookmarks/js'); - + + elgg_register_widget_type('bookmarks', elgg_echo('bookmarks'), elgg_echo('bookmarks:widget:description')); + if (elgg_is_logged_in()) { $user_guid = elgg_get_logged_in_user_guid(); $address = urlencode(current_page_url()); -- cgit v1.2.3 From 98f18b6fa309d6a68025699848a0dd5652ac75da Mon Sep 17 00:00:00 2001 From: ewinslow Date: Sun, 10 Apr 2011 03:48:40 +0000 Subject: Fixed #3313: Removed the superfluous html_head/extend view from core. Anyone following trunk should extend page/elements/head instead git-svn-id: http://code.elgg.org/elgg/trunk@8978 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/profile/start.php | 2 +- views/default/page/elements/head.php | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'mod') diff --git a/mod/profile/start.php b/mod/profile/start.php index cc4c74fb2..d91b66371 100644 --- a/mod/profile/start.php +++ b/mod/profile/start.php @@ -29,7 +29,7 @@ function profile_init() { // Register a page handler, so we can have nice URLs elgg_register_page_handler('profile', 'profile_page_handler'); - elgg_extend_view('html_head/extend', 'profile/metatags'); + elgg_extend_view('page/elements/head', 'profile/metatags'); elgg_extend_view('css/elgg', 'profile/css'); elgg_extend_view('js/elgg', 'profile/js'); diff --git a/views/default/page/elements/head.php b/views/default/page/elements/head.php index 5f9bf4798..048edec40 100644 --- a/views/default/page/elements/head.php +++ b/views/default/page/elements/head.php @@ -70,7 +70,6 @@ echo $feedref; $metatags = elgg_view('metatags', $vars); if ($metatags) { - elgg_deprecated_notice("The metatags view has been deprecated for html_head/extend", 1.8); + elgg_deprecated_notice("The metatags view has been deprecated. Extend page/elements/head instead", 1.8); echo $metatags; -} -echo elgg_view('html_head/extend', $vars); +} \ No newline at end of file -- cgit v1.2.3 From b3807125e2c4d0c5bad39d5fab33228de7f5f65e Mon Sep 17 00:00:00 2001 From: cash Date: Mon, 11 Apr 2011 11:43:03 +0000 Subject: Fixes #3322 file link removed from owner_block if disabled for a group git-svn-id: http://code.elgg.org/elgg/trunk@8979 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/file/start.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mod') diff --git a/mod/file/start.php b/mod/file/start.php index 218edef51..d4f12e903 100644 --- a/mod/file/start.php +++ b/mod/file/start.php @@ -151,7 +151,7 @@ function file_owner_block_menu($hook, $type, $return, $params) { $item = new ElggMenuItem('file', elgg_echo('file'), $url); $return[] = $item; } else { - if ($params['entity']->files_enable != "no") { + if ($params['entity']->file_enable != "no") { $url = "file/group/{$params['entity']->guid}/owner"; $item = new ElggMenuItem('file', elgg_echo('file:group'), $url); $return[] = $item; -- cgit v1.2.3