Commit b79d992b authored by Robert Lyon's avatar Robert Lyon
Browse files

Bug 1852020: Cache nav menu for mobile different to desktop 



As the menus are slightly different - the mobile one doesn't have
import/export menu items

behat not needed

Change-Id: Ia84f68cbe12a5a6555b7e2e378b44b41875b9328
Signed-off-by: default avatarRobert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit a1ad5685)
parent 93f2b6a9

htdocs/lib/web.php

+7 −7
Original line number Diff line number Diff line
@@ -2959,35 +2959,35 @@ function mahara_standard_nav() { 
 * @return array

 */

function main_nav($type = null) {

    global $USER;

    global $USER, $SESSION;



    $language = current_language();

    $cachemenu = false;

    // Get the first institution

    $institution = $USER->get_primary_institution();

    $menutype = '';

    $menutype = $SESSION->get('handheld_device') ? 'mob_' : '';

    if ($type == 'adminnav') {

        global $USER, $SESSION;

        if ($USER->get('admin')) {

            $menutype = 'admin_nav';

            $menutype .= 'admin_nav';

            if (!($cachemenu = get_config_institution($institution, $menutype . '_' . $language))) {

                $menu = admin_nav();

            }

        }

        else if ($USER->get('staff')) {

            $menutype = 'staff_nav';

            $menutype .= 'staff_nav';

            if (!($cachemenu = get_config_institution($institution, $menutype . '_' . $language))) {

                $menu = staff_nav();

            }

        }

        else if ($USER->is_institutional_admin()) {

            $menutype = 'instadmin_nav';

            $menutype .= 'instadmin_nav';

            if (!($cachemenu = get_config_institution($institution, $menutype . '_' . $language))) {

                $menu = institutional_admin_nav();

            }

        }

        else {

            $menutype = 'inststaff_nav';

            $menutype .= 'inststaff_nav';

            if (!($cachemenu = get_config_institution($institution, $menutype . '_' . $language))) {

                $menu = institutional_staff_nav();

            }
@@ -2995,7 +2995,7 @@ function main_nav($type = null) { 
    }

    else {

        // Build the menu structure for the site

        $menutype = 'standard_nav';

        $menutype .= 'standard_nav';

        if (!($cachemenu = get_config_institution($institution, $menutype . '_' . $language))) {

            $menu = mahara_standard_nav();

        }