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
Piwigo · Mar 12, 2014 · cdeb595 · cdeb595
1 parent fadbc98
commit cdeb595
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/include/ws_functions/pwg.users.php b/include/ws_functions/pwg.users.php
@@ -251,6 +251,8 @@ function ws_users_getList($params, &$service)
     }
   }
 
+  $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
@@ -837,6 +837,13 @@
   '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>