merge r27713 from branch 2.6 to trunk

feature 3014: new trigger picture_modify_before_update git-svn-id: http://piwigo.org/svn/trunk@27714 68402e56-0260-453c-a942-63ccdbb3a9ee
Piwigo · Mar 12, 2014 · fadbc98 · fadbc98
1 parent 5b0a3e2
commit fadbc98
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/admin/picture_modify.php b/admin/picture_modify.php
@@ -154,6 +154,8 @@
     $data{'date_creation'} = null;
   }
 
+  $data = trigger_change('picture_modify_before_update', $data);
+
   single_update(
     IMAGES_TABLE,
     $data,

diff --git a/tools/triggers_list.php b/tools/triggers_list.php
@@ -830,6 +830,13 @@
   'files' => array('include\functions_rate.inc.php'),
   'infos' => 'New in 2.6.',
 ),
+array(
+  'name' => 'picture_modify_before_update',
+  'type' => 'trigger_event',
+  'vars' => array('array', 'data'),
+  'files' => array('admin\picture_modify.php'),
+  'infos' => 'New in 2.6.2.',
+),
 );
 ?>
 <!DOCTYPE html>
@@ -1006,4 +1013,4 @@
 </script>
 
 </body>
-</html>
+</html>