Pulled in missing interface modifications for the engine dir.

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

diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index c6a03cc4f73d2a3534b02e741a45499300cd2f88..3c95ef2be4707492e2648973264d44d37721e5fa 100644 (file)
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -259,6 +259,7 @@ function elgg_view($view, $vars = array(), $bypass = false, $debug = false, $vie
        } else {
                $viewlist = array(500 => $view);
        }
+
        // Start the output buffer, find the requested view file, and execute it
        ob_start();
 
@@ -860,7 +861,6 @@ function elgg_view_layout($layout) {
                $param_array['area' . $arg] = func_get_arg($arg);
                $arg++;
        }
-
        if (elgg_view_exists("canvas/layouts/{$layout}")) {
                return elgg_view("canvas/layouts/{$layout}",$param_array);
        } else {
@@ -964,7 +964,6 @@ function get_submenu() {
                                                                $selected = TRUE;
                                                        } else {
                                                                if ($uri_info['query'] == $item_info['query']) {
-                                                                       //var_dump("Good on 1");
                                                                        $selected_key = $key;
                                                                        $selected_group = $groupname;
                                                                        $selected = TRUE;
@@ -1203,13 +1202,14 @@ function page_draw($title, $body, $sidebar = "") {
        }
 
        // Draw the page
-       $output = elgg_view('pageshells/pageshell', array(
+       $output = elgg_view('page_shells/default', array(
                'title' => $title,
                'body' => $body,
                'sidebar' => $sidebar,
                'sysmessages' => $sysmessages,
                )
        );
+
        $split_output = str_split($output, 1024);
 
        foreach($split_output as $chunk) {

diff --git a/engine/lib/users.php b/engine/lib/users.php
index 549dd35957ad2c1a53db40120e3120bea32eff1a..a0bdeabc561e98e2bf38471735d3f7a754e87759 100644 (file)
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -1475,7 +1475,7 @@ function friends_page_handler($page_elements) {
                set_page_owner($user->getGUID());
        }
        if ($_SESSION['guid'] == page_owner()) {
-               collections_submenu_items();
+               // collections_submenu_items(); disabled for now as we no longer use friends collections (replaced by shared access)
        }
 
        require_once(dirname(dirname(dirname(__FILE__))) . "/friends/index.php");
@@ -1490,7 +1490,7 @@ function friends_of_page_handler($page_elements) {
                set_page_owner($user->getGUID());
        }
        if ($_SESSION['guid'] == page_owner()) {
-               collections_submenu_items();
+               // collections_submenu_items(); disabled for now as we no longer use friends collections (replaced by shared access)
        }
        require_once(dirname(dirname(dirname(__FILE__))) . "/friends/of.php");
 }
@@ -1609,9 +1609,11 @@ function users_pagesetup() {
        global $CONFIG;
 
        //add submenu options
-       if (get_context() == "friends" || get_context() == "friendsof" || get_context() == "collections") {
+       if (get_context() == "friends" || get_context() == "friendsof") {  // || get_context() == "collections") { - disabled as we no longer use collections
                add_submenu_item(elgg_echo('friends'),$CONFIG->wwwroot."pg/friends/" . page_owner_entity()->username);
                add_submenu_item(elgg_echo('friends:of'),$CONFIG->wwwroot."pg/friendsof/" . page_owner_entity()->username);
+               if(is_plugin_enabled('members'))
+                       add_submenu_item(elgg_echo('members:browse'), $CONFIG->wwwroot . "mod/members/index.php");
        }
 }
 
@@ -1623,15 +1625,15 @@ function users_init() {
        // Load config
        global $CONFIG;
 
-       // Set up menu for logged in users
-       if (isloggedin()) {
+       // add Friends to tools menu - if profile mod is running
+       if ( isloggedin() && is_plugin_enabled('profile') ) {
                $user = get_loggedin_user();
                add_menu(elgg_echo('friends'), $CONFIG->wwwroot . "pg/friends/" . $user->username);
        }
 
        register_page_handler('friends', 'friends_page_handler');
        register_page_handler('friendsof', 'friends_of_page_handler');
-       register_page_handler('collections', 'collections_page_handler');
+       //register_page_handler('collections', 'collections_page_handler');
        register_page_handler('dashboard', 'dashboard_page_handler');
        register_page_handler('register', 'registration_page_handler');
        register_page_handler('resetpassword', 'elgg_user_resetpassword_page_handler');
@@ -1640,10 +1642,10 @@ function users_init() {
        register_action("useradd", true);
        register_action("friends/add");
        register_action("friends/remove");
-       register_action('friends/addcollection');
-       register_action('friends/deletecollection');
-       register_action('friends/editcollection');
-       register_action("user/spotlight");
+       //register_action('friends/addcollection');
+       //register_action('friends/deletecollection');
+       //register_action('friends/editcollection');
+       //register_action("user/spotlight");
 
        register_action("usersettings/save");