Commit 55b7bef0 authored by Robert Lyon's avatar Robert Lyon
Browse files

Bug 1784762: Need to typecast tag results when using another language 



To test:
1) Site on latest master - using postgres
2) Have installed a lang pack
3) On homepage when logged out select language from dropdown
4) Login

before: errors
after: no errors

behatnotneeded

Change-Id: I2f61a9c319c98335749aa5e628e4a378c3cdc23e
Signed-off-by: default avatarRobert Lyon <robertl@catalyst.net.nz>
parent d99d0c75

htdocs/lib/user.php

+4 −3
Original line number Diff line number Diff line
@@ -115,9 +115,10 @@ function change_language($userid, $oldlang, $newlang) { 
        safe_require('artefact', 'file');

        ArtefactTypeFolder::change_language($userid, $oldlang, $newlang);

    }

    set_field_select('tag', 'tag', get_string_from_language($newlang, 'profile'), "WHERE tag = ? AND resourcetype = 'artefact' AND resourceid IN (SELECT id FROM {artefact} WHERE \"owner\" = ?)", array(get_string_from_language($oldlang, 'profile'), $userid));

    set_field_select('tag', 'tag', get_string_from_language($newlang, 'profile'), "WHERE tag = ? AND resourcetype = 'view' AND resourceid IN (SELECT id FROM {view} WHERE \"owner\" = ?)", array(get_string_from_language($oldlang, 'profile'), $userid));

    set_field_select('tag', 'tag', get_string_from_language($newlang, 'profile'), "WHERE tag = ? AND resourcetype = 'collection' AND resourceid IN (SELECT id FROM {collection} WHERE \"owner\" = ?)", array(get_string_from_language($oldlang, 'profile'), $userid));

    $typecast = is_postgres() ? '::varchar' : '';

    set_field_select('tag', 'tag', get_string_from_language($newlang, 'profile'), "WHERE tag = ? AND resourcetype = 'artefact' AND resourceid IN (SELECT id" . $typecast . " FROM {artefact} WHERE \"owner\" = ?)", array(get_string_from_language($oldlang, 'profile'), $userid));

    set_field_select('tag', 'tag', get_string_from_language($newlang, 'profile'), "WHERE tag = ? AND resourcetype = 'view' AND resourceid IN (SELECT id" . $typecast . " FROM {view} WHERE \"owner\" = ?)", array(get_string_from_language($oldlang, 'profile'), $userid));

    set_field_select('tag', 'tag', get_string_from_language($newlang, 'profile'), "WHERE tag = ? AND resourcetype = 'collection' AND resourceid IN (SELECT id" . $typecast . " FROM {collection} WHERE \"owner\" = ?)", array(get_string_from_language($oldlang, 'profile'), $userid));

}



/**