From 66036138926c671172a861262b57862e8fe496b1 Mon Sep 17 00:00:00 2001 From: plegall Date: Wed, 3 Nov 2010 22:24:48 +0000 Subject: merge r7612 from branch 2.1 to trunk bug 2003 fixed: random failure on calling invalidate_user_cache. I move the include of admin functions outside conditional blocks, even if we should also enter the first block. git-svn-id: http://piwigo.org/svn/trunk@7613 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/ws_functions.inc.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/ws_functions.inc.php b/include/ws_functions.inc.php index a86c54a81..4cc9fff20 100644 --- a/include/ws_functions.inc.php +++ b/include/ws_functions.inc.php @@ -1806,6 +1806,8 @@ function ws_images_setInfo($params, &$service) return new PwgError(WS_ERR_INVALID_PARAM, "Invalid image_id"); } + include_once(PHPWG_ROOT_PATH.'admin/include/functions.php'); + $query=' SELECT * FROM '.IMAGES_TABLE.' @@ -1861,7 +1863,6 @@ SELECT * { $update['id'] = $params['image_id']; - include_once(PHPWG_ROOT_PATH.'admin/include/functions.php'); mass_updates( IMAGES_TABLE, array( @@ -1884,8 +1885,6 @@ SELECT * // and now, let's create tag associations if (isset($params['tag_ids'])) { - include_once(PHPWG_ROOT_PATH.'admin/include/functions.php'); - $tag_ids = explode(',', $params['tag_ids']); if ('replace' == $params['multiple_value_mode']) -- cgit v1.2.3