diff options
| author | plegall <plg@piwigo.org> | 2014-03-12 13:42:31 +0000 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2014-03-12 13:42:31 +0000 |
| commit | cdeb5959bb052b2a79dc62d987034813d4d9b298 (patch) | |
| tree | 8b07eaccf18ff230884fb0f6fd6e0dc6580c02b7 | |
| parent | fadbc982598b2a342c968ab0b8d7c75dd6845d83 (diff) | |
merge r27715 from branch 2.6 to trunk
feature 3054: new trigger ws_users_getList
git-svn-id: http://piwigo.org/svn/trunk@27716 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
| -rw-r--r-- | include/ws_functions/pwg.users.php | 2 | ||||
| -rw-r--r-- | tools/triggers_list.php | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/include/ws_functions/pwg.users.php b/include/ws_functions/pwg.users.php index d8b70c6ae..345d8f661 100644 --- a/include/ws_functions/pwg.users.php +++ b/include/ws_functions/pwg.users.php @@ -251,6 +251,8 @@ SELECT } } + $users = trigger_change('ws_users_getList', $users); + return array( 'paging' => new PwgNamedStruct( array( diff --git a/tools/triggers_list.php b/tools/triggers_list.php index a61ece639..cf36a6309 100644 --- a/tools/triggers_list.php +++ b/tools/triggers_list.php @@ -837,6 +837,13 @@ array( 'files' => array('admin\picture_modify.php'), 'infos' => 'New in 2.6.2.', ), +array( + 'name' => 'ws_users_getList', + 'type' => 'trigger_event', + 'vars' => array('array', 'users'), + 'files' => array('include\ws_functions\pwg.users.php'), + 'infos' => 'New in 2.6.2.', +), ); ?> <!DOCTYPE html> |