Commit eda86d15 authored by Nigel McNie's avatar Nigel McNie
Browse files

Fix for bug #793 - now next/last page strings work in the friends section.

This was caused by the tablerenderer calling get_string to get defaults, before the javascript that set the strings was output. Solved by putting the javascript that outputs the JS language strings before any including of other javascript files.
parent 03995a1c
......@@ -290,7 +290,6 @@ EOF;
$stringjs = '<script type="text/javascript">';
$stringjs .= 'var strings = ' . json_encode($strings) . ';';
$stringjs .= '</script>';
$headers[] = $stringjs;
// stylesheet set up - if we're in a plugin also get its stylesheet
......@@ -314,6 +313,7 @@ EOF;
}
$smarty = smarty_core();
$smarty->assign('STRINGJS', $stringjs);
$smarty->assign('STYLESHEETLIST', $stylesheets);
if (!empty($theme_list)) {
......
......@@ -12,6 +12,7 @@
'userid': {$USER->get('id')}
{literal}}{/literal};
</script>
{$STRINGJS}
{foreach from=$JAVASCRIPT item=script} <script type="text/javascript" src="{$script}"></script>
{/foreach}
{foreach from=$HEADERS item=header} {$header}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment