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
2014-03-12 13:42:31 +00:00 · 2014-03-12 13:42:31 +00:00 · cdeb5959bb
commit cdeb5959bb
parent fadbc98259
2 changed files with 9 additions and 0 deletions
--- 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(
--- 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>