aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpatdenice <patdenice@piwigo.org>2008-09-28 15:12:43 +0000
committerpatdenice <patdenice@piwigo.org>2008-09-28 15:12:43 +0000
commit3ede19df235dce67fbd3f5dd8b5d8d07ae95e254 (patch)
tree449a4f552d55a0b29fcaa254734ce245988124c2
parent7bc97f00a4280ce2b2d24d4f1b3498c392246290 (diff)
Bug 871: guest is not saved in history table
git-svn-id: http://piwigo.org/svn/trunk@2620 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/functions.inc.php14
1 files changed, 5 insertions, 9 deletions
diff --git a/include/functions.inc.php b/include/functions.inc.php
index 3dd62802e..f2c5511dd 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -514,18 +514,14 @@ function pwg_log($image_id = null, $image_type = null)
{
global $conf, $user, $page;
- $do_log = true;
- if (!$conf['log'])
+ $do_log = $conf['log'];
+ if (is_admin())
{
- $do_log = false;
+ $do_log = $conf['history_admin'];
}
- if (is_admin() and !$conf['history_admin'])
+ if (is_a_guest())
{
- $do_log = false;
- }
- if (is_a_guest() and !$conf['history_guest'])
- {
- $do_log = false;
+ $do_log = $conf['history_guest'];
}
$do_log = trigger_event('pwg_log_allowed', $do_log, $image_id, $image_type);