adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-06-02 04:15:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Piwigo/Piwigo

Browse Source
This commit is contained in:
modus75
2016-12-09 22:01:41 +01:00
parent 25e2954490 806a3b7ae7
commit 9b6ec85f09
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/themes/default/template/user_list.tpl
+3 -3
View File
@@ -93,7 +93,7 @@ jQuery(document).ready(function() {
jQuery("#addUserForm .loading").show();
},
success:function(data) {
oTable.draw();
oTable.api().draw();
jQuery("#addUserForm .loading").hide();
var data = jQuery.parseJSON(data);
@@ -584,7 +584,7 @@ jQuery(document).on('click', '.close-user-details', function(e) {
title:"{/literal}{'Edit user'|translate}{literal}",
href:".user_form_popin",
onClosed: function() {
oTable.draw();
oTable.api().draw();
}
});
@@ -825,7 +825,7 @@ jQuery(document).on('click', '.close-user-details', function(e) {
jQuery("#applyActionLoading").show();
},
success:function(data) {
oTable.draw();
oTable.api().draw();
jQuery("#applyActionLoading").hide();
jQuery("#applyActionBlock .infos").show();
include/ws_functions/pwg.php
+1 -1
View File
@@ -327,7 +327,7 @@ function ws_session_getStatus($params, &$service)
list($dbnow) = pwg_db_fetch_row(pwg_query('SELECT NOW();'));
$res['current_datetime'] = $dbnow;
$res['version'] = PHPWG_VERSION;
$res['available_sizes'] = implode(',', array_keys(ImageStdParams::get_defined_type_map()));
$res['available_sizes'] = array_keys(ImageStdParams::get_defined_type_map());
if (is_admin())
{