summaryrefslogtreecommitdiff
path: root/slideshow.php
diff options
context:
space:
mode:
authorMax Kremmel <xing@synapse.plus.com>2005-08-07 17:46:51 +0000
committerMax Kremmel <xing@synapse.plus.com>2005-08-07 17:46:51 +0000
commit84c9b11f4260b9add6dae43d098db6ba364ddf36 (patch)
tree4c1cca09213a184c4724ddf85e66a7ebc9dc8d31 /slideshow.php
parentaa1fc688af3a1b78a73369d378b0c5b3cdbd9bee (diff)
downloadwiki-84c9b11f4260b9add6dae43d098db6ba364ddf36.tar.gz
wiki-84c9b11f4260b9add6dae43d098db6ba364ddf36.tar.bz2
wiki-84c9b11f4260b9add6dae43d098db6ba364ddf36.zip
merge recent changes from R1 to HEAD
Diffstat (limited to 'slideshow.php')
-rwxr-xr-xslideshow.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/slideshow.php b/slideshow.php
index 27022f7..a8524e7 100755
--- a/slideshow.php
+++ b/slideshow.php
@@ -1,6 +1,6 @@
<?php
/**
- * $Header: /cvsroot/bitweaver/_bit_wiki/slideshow.php,v 1.3 2005/08/01 18:42:04 squareing Exp $
+ * $Header: /cvsroot/bitweaver/_bit_wiki/slideshow.php,v 1.4 2005/08/07 17:46:49 squareing Exp $
*
* Copyright (c) 2004 bitweaver.org
* Copyright (c) 2003 tikwiki.org
@@ -8,7 +8,7 @@
* All Rights Reserved. See copyright.txt for details and a complete list of authors.
* Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details
*
- * $Id: slideshow.php,v 1.3 2005/08/01 18:42:04 squareing Exp $
+ * $Id: slideshow.php,v 1.4 2005/08/07 17:46:49 squareing Exp $
* @package wiki
* @subpackage functions
*/
@@ -78,7 +78,7 @@ if (!$gBitUser->hasPermission( 'bit_p_view' )) {
$anonpref = $wikilib->getPreference('userbreadCrumb', 4);
if( $gBitUser->isRegistered() ) {
- $userbreadCrumb = $wikilib->get_user_preference($user, 'userbreadCrumb', $anonpref);
+ $userbreadCrumb = $wikilib->getPreference('userbreadCrumb', $anonpref, $user );
} else {
$userbreadCrumb = $anonpref;
}