diff options
| author | plegall <plg@piwigo.org> | 2010-11-03 22:24:48 +0000 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2010-11-03 22:24:48 +0000 |
| commit | 66036138926c671172a861262b57862e8fe496b1 (patch) | |
| tree | cccebc934db6a796675151be0842d0eccd0f0575 | |
| parent | a5ad1bbe7e45432401e08c13a4a507be0807b8a4 (diff) | |
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
| -rw-r--r-- | include/ws_functions.inc.php | 5 |
1 files changed, 2 insertions, 3 deletions
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']) |