summaryrefslogtreecommitdiff
path: root/admin
diff options
context:
space:
mode:
authorMax Kremmel <xing@synapse.plus.com>2007-11-01 23:30:53 +0000
committerMax Kremmel <xing@synapse.plus.com>2007-11-01 23:30:53 +0000
commitb64980e5409101fd68882669b41d217d888e7b94 (patch)
treefff1b06613b6b6e2cb3f14c01f2be466dabbd9f7 /admin
parent16386d422da602891ad90eda10729bd17d535986 (diff)
downloadpigeonholes-b64980e5409101fd68882669b41d217d888e7b94.tar.gz
pigeonholes-b64980e5409101fd68882669b41d217d888e7b94.tar.bz2
pigeonholes-b64980e5409101fd68882669b41d217d888e7b94.zip
merge all settings arrays
Diffstat (limited to 'admin')
-rw-r--r--admin/admin_pigeonholes_inc.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/admin/admin_pigeonholes_inc.php b/admin/admin_pigeonholes_inc.php
index e7456f6..aa169f3 100644
--- a/admin/admin_pigeonholes_inc.php
+++ b/admin/admin_pigeonholes_inc.php
@@ -1,5 +1,5 @@
<?php
-// $Header: /cvsroot/bitweaver/_bit_pigeonholes/admin/admin_pigeonholes_inc.php,v 1.20 2007/10/21 08:34:35 squareing Exp $
+// $Header: /cvsroot/bitweaver/_bit_pigeonholes/admin/admin_pigeonholes_inc.php,v 1.21 2007/11/01 23:30:53 squareing Exp $
$pigeonholeDisplaySettings = array(
'pigeonholes_display_path' => array(
@@ -91,7 +91,7 @@ $gBitSmarty->assign( 'memberLimit', $memberLimit );
$gBitSmarty->assign( 'imageSizes', get_image_size_options() );
if( !empty( $_REQUEST['pigeonhole_settings'] ) ) {
- $pigeonholeSettings = array_merge( $pigeonholeDisplaySettings, $pigeonholeContentEditSettings );
+ $pigeonholeSettings = array_merge( $pigeonholeDisplaySettings, $pigeonholeListSettings, $pigeonholeEditSettings, $pigeonholeContentEditSettings );
foreach( array_keys( $pigeonholeSettings ) as $item ) {
simple_set_toggle( $item, PIGEONHOLES_PKG_NAME );
}