diff options
| -rw-r--r-- | mod/bookmarks/all.php | 16 | ||||
| -rw-r--r-- | mod/bookmarks/index.php | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/mod/bookmarks/all.php b/mod/bookmarks/all.php index a4bdae7af..87dd5f852 100644 --- a/mod/bookmarks/all.php +++ b/mod/bookmarks/all.php @@ -1,7 +1,7 @@ <?php /** * Elgg bookmarks plugin everyone page - * + * * @package ElggBookmarks * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2 * @author Curverider <info@elgg.com> @@ -11,27 +11,27 @@ // Start engine require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php"); - + // get the filter menu $area1 = elgg_view('page_elements/content_header', array('context' => "everyone", 'type' => 'bookmarks')); - + // List bookmarks set_context('search'); -$area2 .= list_entities('object','bookmarks'); +$area2 .= elgg_list_entities(array('type' => 'object', 'subtype' => 'bookmarks')); set_context('bookmarks'); // include a view for plugins to extend $area3 = elgg_view("bookmarks/sidebar", array("object_type" => 'bookmarks')); // if logged in, get the bookmarklet -if(isloggedin()){ - $area3 .= elgg_view("bookmarks/bookmarklet"); -} +if(isloggedin()){ + $area3 .= elgg_view("bookmarks/bookmarklet"); +} // include statistics $count = elgg_get_entities(array('type' => 'object', 'subtype' => 'bookmarks', 'count' => true)); $area3 .= elgg_view("bookmarks/stats", array('count' => $count)); // Format page $body = elgg_view_layout('one_column_with_sidebar', $area1.$area2, $area3); - + // Draw it echo page_draw(elgg_echo('bookmarks:all'),$body);
\ No newline at end of file diff --git a/mod/bookmarks/index.php b/mod/bookmarks/index.php index 32f4b23f6..21166f7a9 100644 --- a/mod/bookmarks/index.php +++ b/mod/bookmarks/index.php @@ -36,7 +36,7 @@ if(page_owner() == get_loggedin_userid()) { // List bookmarks set_context('search'); -$bookmarks = list_entities('object','bookmarks',page_owner()); +$bookmarks = elgg_list_entities(array('type' => 'object', 'subtype' => 'bookmarks', 'owner_guid' => page_owner())); if(!$bookmarks && ($page_owner->guid == get_loggedin_user()->guid)) $bookmarks = elgg_view('help/bookmarks'); $area2 .= $bookmarks; @@ -49,7 +49,7 @@ if(page_owner() != get_loggedin_user()->guid){ // include a view for plugins to extend $area3 .= elgg_view("bookmarks/sidebar", array("object_type" => 'bookmarks')); -if(isloggedin()){ +if(isloggedin()){ // if logged in, get the bookmarklet $area3 .= elgg_view("bookmarks/bookmarklet"); } |