diff options
| author | plegall <plg@piwigo.org> | 2014-09-11 12:50:39 +0000 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2014-09-11 12:50:39 +0000 |
| commit | 8b4fa61135fe5c60f8a820fde30a74dd27509427 (patch) | |
| tree | 86ce4b14151f7ba4bd0a742d3c971158228e8159 /admin/popuphelp.php | |
| parent | 0ffdff9439969bc845b4060e0743e12e000fd9e4 (diff) | |
feature 3139: add details about search on id: in the help
Move CSS outside the help file
bug fixed: fallback on en_UK in case of missing help file
git-svn-id: http://piwigo.org/svn/trunk@29485 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin/popuphelp.php')
| -rw-r--r-- | admin/popuphelp.php | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/admin/popuphelp.php b/admin/popuphelp.php index 8c431c88b..7d0a0cf8b 100644 --- a/admin/popuphelp.php +++ b/admin/popuphelp.php @@ -47,16 +47,21 @@ if and preg_match('/^[a-z_]*$/', $_GET['page']) ) { - $help_content = - load_language('help/'.$_GET['page'].'.html', '', array('return'=>true) ); + $help_content = load_language( + 'help/'.$_GET['page'].'.html', + '', + array( + 'force_fallback' => 'en_UK', + 'return' => true, + ) + ); if ($help_content == false) { $help_content = ''; } - $help_content = trigger_change( - 'get_popup_help_content', $help_content, $_GET['page']); + $help_content = trigger_change('get_popup_help_content', $help_content, $_GET['page']); } else { |