diff options
| author | Brett Profitt <brett.profitt@gmail.com> | 2011-04-16 11:52:37 -0400 |
|---|---|---|
| committer | Brett Profitt <brett.profitt@gmail.com> | 2011-04-16 11:52:37 -0400 |
| commit | 309dff2bf948ab191ccb1e8d4a777e49ad498820 (patch) | |
| tree | 813350181be64e239287c0bb587a3a49320a49b7 /mod | |
| parent | 119ec1f1425ab77ed29c696d99c0c80df3886791 (diff) | |
| parent | 2b2afd98c05139c1a5c25f1752e2bb412e26e335 (diff) | |
| download | elgg-309dff2bf948ab191ccb1e8d4a777e49ad498820.tar.gz elgg-309dff2bf948ab191ccb1e8d4a777e49ad498820.tar.bz2 | |
Merge branch 'master' of github.com:Elgg/Elgg
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/bookmarks/languages/en.php | 3 | ||||
| -rw-r--r-- | mod/bookmarks/start.php | 4 | ||||
| -rw-r--r-- | mod/file/start.php | 2 | ||||
| -rw-r--r-- | mod/profile/start.php | 2 | ||||
| -rw-r--r-- | mod/twitter_api/lib/twitter_api.php | 4 |
5 files changed, 8 insertions, 7 deletions
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()); 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; 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/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 |