Commit f00091e0 authored by Philippe Adrian's avatar Philippe Adrian Committed by Robert Lyon
Browse files

Bug 1882103: Wrong redirect when creating Pages when Mahara is in a subdir 

-added root directory to redirect

Change-Id: I7037c2b01a84a146bc6ffc6961e4435115dd2c25
parent 555fa2e3

htdocs/admin/groups/uploadcsv.php

+1 −1
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ function uploadcsv_submit(Pieform $form, $values) { 


    $form->reply(PIEFORM_OK, array(

       'message'  => get_string('csvfileprocessedsuccessfully', 'admin'),

       'goto'     => '/admin/groups/uploadcsv.php',

       'goto'     => get_config('wwwroot') . 'admin/groups/uploadcsv.php',

    ));

}

htdocs/admin/groups/uploadmemberscsv.php

+1 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ function uploadcsv_submit(Pieform $form, $values) { 


    $form->reply(PIEFORM_OK, array(

        'message'  => get_string('csvfileprocessedsuccessfully', 'admin'),

        'goto'     => '/admin/groups/uploadmemberscsv.php',

        'goto'     => get_config('wwwroot') . 'admin/groups/uploadmemberscsv.php',

    ));

}

htdocs/admin/site/networking.php

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ function networkingform_submit(Pieform $form, $values) { 


    $form->reply(PIEFORM_OK, array(

        'message' => ($reply == '') ? get_string('networkingunchanged','admin') : $reply,

        'goto'    => '/admin/site/networking.php',

        'goto'    => get_config('wwwroot') . 'admin/site/networking.php',

    ));

}

htdocs/admin/site/options.php

+2 −2
Original line number Diff line number Diff line
@@ -1018,7 +1018,7 @@ function siteoptions_submit(Pieform $form, $values) { 
    if ($fieldsfailed > 0) {

        $form->reply(PIEFORM_ERR, array(

            'message' => get_string('setsiteoptionsfailednotice', 'admin', $fieldsfailed),

            'goto'    => '/admin/site/options.php',

            'goto'    => get_config('wwwroot') . 'admin/site/options.php',

        ));

    }
@@ -1042,7 +1042,7 @@ function siteoptions_submit(Pieform $form, $values) { 
    if ($count) {

        $message .= ' ' . get_string('numberusersupdated','admin', $count);

    }

    $form->reply(PIEFORM_OK, array('message' => $message, 'goto' => '/admin/site/options.php'));

    $form->reply(PIEFORM_OK, array('message' => $message, 'goto' => get_config('wwwroot') . 'admin/site/options.php'));

}



$usermultipleinstitutions = (!empty(users_in_multiple_institutions()) ? "true" : "false");

htdocs/admin/users/add.php

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ function adduser_validate(Pieform $form, $values) { 
        if (!$values['leap2afile'] && ($_FILES['leap2afile']['error'] == UPLOAD_ERR_INI_SIZE || $_FILES['leap2afile']['error'] == UPLOAD_ERR_FORM_SIZE)) {

            $form->reply(PIEFORM_ERR, array(

                'message' => get_string('uploadedfiletoobig1', 'mahara', display_size(get_max_upload_size(false))),

                'goto'    => '/admin/users/add.php'));

                'goto'    => get_config('wwwroot') . 'admin/users/add.php'));

            $form->set_error('leap2afile', get_string('uploadedfiletoobig1', 'mahara', display_size(get_max_upload_size(false))));

            return;

        }