restore array merge. THIS IS CRUCIAL.

5 files changed, 9 insertions, 9 deletions

diff --git a/FisheyeImage.php b/FisheyeImage.php
index ef45c93..4435b1a 100644
--- a/FisheyeImage.php
+++ b/FisheyeImage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Header: /cvsroot/bitweaver/_bit_fisheye/FisheyeImage.php,v 1.90 2008/09/17 06:54:04 squareing Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_fisheye/FisheyeImage.php,v 1.91 2008/09/18 04:23:16 spiderr Exp $
  * @package fisheye
  */
 
@@ -120,7 +120,7 @@ class FisheyeImage extends FisheyeBase {
 				// Copy mStorage to mInfo['image_file'] for easy access
 				if( !empty( $this->mStorage ) && count( $this->mStorage ) > 0 ) {
 					// it seems that this is not necessary and causes confusing copies of the same stuff all over the place
-					//$this->mInfo = array_merge( current( $this->mStorage ), $this->mInfo );
+					$this->mInfo = array_merge( current( $this->mStorage ), $this->mInfo );
 					// copy the image data by reference to reduce memory
 					reset( $this->mStorage );
 					$this->mInfo['image_file'] =& current( $this->mStorage );
diff --git a/bit_setup_inc.php b/bit_setup_inc.php
index 0e57f76..c54fd95 100644
--- a/bit_setup_inc.php
+++ b/bit_setup_inc.php
@@ -13,7 +13,7 @@ if( $gBitSystem->isPackageActive( 'fisheye' ) && $gBitUser->hasPermission( 'p_fi
 	// Default Preferences Defines
 	define ( 'FISHEYE_DEFAULT_ROWS_PER_PAGE', 5 );
 	define ( 'FISHEYE_DEFAULT_COLS_PER_PAGE', 2 );
-	define ( 'FISHEYE_DEFAULT_THUMBNAIL_SIZE', 'small' );
+	define ( 'FISHEYE_DEFAULT_THUMBNAIL_SIZE', 'large' );
 
 	$gBitSmarty->assign( 'FISHEYE_DEFAULT_ROWS_PER_PAGE', FISHEYE_DEFAULT_ROWS_PER_PAGE );
 	$gBitSmarty->assign( 'FISHEYE_DEFAULT_COLS_PER_PAGE', FISHEYE_DEFAULT_COLS_PER_PAGE );
diff --git a/display_fisheye_image_inc.php b/display_fisheye_image_inc.php
index 8660bb5..fb03fe6 100644
--- a/display_fisheye_image_inc.php
+++ b/display_fisheye_image_inc.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Header: /cvsroot/bitweaver/_bit_fisheye/display_fisheye_image_inc.php,v 1.12 2008/09/15 01:38:34 spiderr Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_fisheye/display_fisheye_image_inc.php,v 1.13 2008/09/18 04:23:16 spiderr Exp $
  * @package fisheye
  * @subpackage functions
  */
@@ -18,8 +18,8 @@ reset($gContent->mStorage);
 $imageStorage = current($gContent->mStorage);
 
 $thumbSize = (!empty( $_REQUEST['size'] ) ? $_REQUEST['size'] :
-				(!empty( $_COOKIE['fisheyeviewsize'] ) ? $_COOKIE['fisheyeviewsize'] :
-				$gBitSystem->getConfig('fisheye_image_default_thumbnail_size', FISHEYE_DEFAULT_THUMBNAIL_SIZE)));
+//				(!empty( $_COOKIE['fisheyeviewsize'] ) ? $_COOKIE['fisheyeviewsize'] :
+				$gBitSystem->getConfig('fisheye_image_default_thumbnail_size', FISHEYE_DEFAULT_THUMBNAIL_SIZE));
 // This is handled by LM so we can probably trim
 $gContent->mInfo['display_url'] = $gContent->getThumbnailUrl( $thumbSize );
 
diff --git a/templates/list_galleries.tpl b/templates/list_galleries.tpl
index 2c687ec..cb74a75 100644
--- a/templates/list_galleries.tpl
+++ b/templates/list_galleries.tpl
@@ -67,10 +67,10 @@
 					{if $gBitSystem->isFeatureActive('fisheye_list_created' ) or $gBitSystem->isFeatureActive('fisheye_list_lastmodif' )}
 						<div class="date">
 							{if $gBitSystem->isFeatureActive('fisheye_list_created' ) }
-								Created: {$gal.created|bit_short_date}<br />
+								{tr}Created{/tr}: {$gal.created|bit_short_date}<br />
 							{/if}
 							{if $gBitSystem->isFeatureActive('fisheye_list_lastmodif' )}
-								Modified: {$gal.last_modified|bit_short_date}<br />
+								{tr}Modified{/tr}: {$gal.last_modified|bit_short_date}<br />
 							{/if}
 						</div>
 					{/if}
diff --git a/templates/view_gallery_files_inc.tpl b/templates/view_gallery_files_inc.tpl
index e2eaf65..a217339 100644
--- a/templates/view_gallery_files_inc.tpl
+++ b/templates/view_gallery_files_inc.tpl
@@ -43,7 +43,7 @@
 			<td>
 				{$gContent->mItems[ix]->mInfo.data}
 				<br />
-				Created: {$gContent->mItems[ix]->mInfo.created|bit_short_datetime} by {displayname login=$gContent->mItems[ix]->mInfo.creator_user real_name=$gContent->mItems[ix]->mInfo.creator_real_name}
+				{tr}Created{/tr}: {$gContent->mItems[ix]->mInfo.created|bit_short_datetime} by {displayname login=$gContent->mItems[ix]->mInfo.creator_user real_name=$gContent->mItems[ix]->mInfo.creator_real_name}
 				<br />
 				Last Modified: {$gContent->mItems[ix]->mInfo.last_modified|bit_short_datetime} by {displayname login=$gContent->mItems[ix]->mInfo.modifier_user real_name=$gContent->mItems[ix]->mInfo.modifier_real_name}
 				<br />