*** classMedia.php.dist	2012-06-06 11:01:40.000000000 -0400
--- classMedia.php	2012-06-06 13:49:42.000000000 -0400
***************
*** 405,415 ****
              $media_size           = @getimagesize($media_thumbnail_file);
          }
  
- 		if ( $_MG_CONF['use_upload_time'] == 1 ) {
-         	$media_time        = MG_getUserDateTimeFormat($this->upload_time);
-         } else {
          	$media_time        = MG_getUserDateTimeFormat($this->time);
!         }
  
          $url_media_item = $url_display_item;
  
--- 405,412 ----
              $media_size           = @getimagesize($media_thumbnail_file);
          }
  
          $media_time  = MG_getUserDateTimeFormat($this->time);
!         $upload_time = MG_getUserDateTimeFormat($this->upload_time);
  
          $url_media_item = $url_display_item;
  
***************
*** 471,478 ****
--- 468,477 ----
  
          if ( $this->owner_id != "" && $this->owner_id > 1 ) {
  	        $username = DB_getItem($_TABLES['users'],'username',"uid=".intval($this->owner_id));
+ 	        $fullname = DB_getItem($_TABLES['users'],'fullname',"uid=".intval($this->owner_id));
          } else {
  	        $username = 'anonymous';
+ 	        $fullname = 'Anonymous';
          }
  
          if ( !isset($resolution_x) ) {
***************
*** 579,585 ****
--- 578,586 ----
              'media_description' => PLG_replaceTags(nl2br($this->description),'mediagallery','media_description'),
              'media_tag'         => strip_tags($this->title),
              'media_time'        => $media_time[0],
+             'upload_time'       => $upload_time[0],
              'media_owner'		=> $username,
+             'owner_fullname'		=> $fullname,
              'site_url'			=> $_MG_CONF['site_url'],
              'lang_published'	=> $LANG_MG03['published'],
              'lang_on'			=> $LANG_MG03['on'],

*** functions.inc.dist	2012-06-09 13:35:47.000000000 -0400
--- functions.inc	2012-06-09 13:51:16.000000000 -0400
***************
*** 1690,1696 ****
      MG_initAlbums();
      $randomSelect = "RAND(NOW()) ";
  
!     $sql = "SELECT ma.album_id,m.media_id,m.media_filename,m.media_title FROM {$_TABLES['mg_albums']} as a LEFT JOIN {$_TABLES['mg_media_albums']} as ma
              on a.album_id=ma.album_id LEFT JOIN {$_TABLES['mg_media']} as m on ma.media_id=m.media_id WHERE
              m.media_type=0 AND a.enable_random=1 AND a.hidden=0 " . COM_getPermSQL('and') . " ORDER BY " . $randomSelect . " LIMIT 1";
  
--- 1690,1696 ----
      MG_initAlbums();
      $randomSelect = "RAND(NOW()) ";
  
!     $sql = "SELECT ma.album_id,m.media_user_id,m.media_id,m.media_filename,m.media_title FROM {$_TABLES['mg_albums']} as a LEFT JOIN {$_TABLES['mg_media_albums']} as ma
              on a.album_id=ma.album_id LEFT JOIN {$_TABLES['mg_media']} as m on ma.media_id=m.media_id WHERE
              m.media_type=0 AND a.enable_random=1 AND a.hidden=0 " . COM_getPermSQL('and') . " ORDER BY " . $randomSelect . " LIMIT 1";
  
***************
*** 1715,1720 ****
--- 1715,1721 ----
          $F = new Template($_MG_CONF['template_path']);
          $F->set_var('media_frame',$imageFrameTemplate);
  
+         $fullname = DB_getItem($_TABLES['users'],'fullname','uid=' . intval($row['media_user_id']));
  
          $T = new Template( MG_getTemplatePath(0) );
          $T->set_file (array ('rblock' => 'random_block.thtml'));
***************
*** 1784,1789 ****
--- 1785,1791 ----
              'media_title'       =>  PLG_replaceTags(strip_tags($row['media_title']),'mediagallery','media_title'),
              'lang_browse_album' =>  $LANG_MG03['browse_album'],
              'framecss'          =>  '',
+             'owner_fullname'    =>  $fullname,
          ));
  
          $T->parse('output', 'rblock');

*** lib-media.php.dist	2012-06-06 11:01:40.000000000 -0400
--- lib-media.php	2012-06-06 13:38:50.000000000 -0400
***************
*** 1622,1632 ****
  
      $mid = $media[$mediaObject]['media_id'];
  
- 	if ( $_MG_CONF['use_upload_time'] == 1 ) {
-     	$media_date = MG_getUserDateTimeFormat( $media[$mediaObject]['upload_time'] );
-     } else {
      	$media_date = MG_getUserDateTimeFormat( $media[$mediaObject]['media_time'] );
!     }
  
      // build the rating bar if rating is enabled.
      if ( $MG_albums[$aid]->enable_rating > 0 ) {
--- 1622,1629 ----
  
      $mid = $media[$mediaObject]['media_id'];
  
      	$media_date = MG_getUserDateTimeFormat( $media[$mediaObject]['media_time'] );
!     $upload_date = MG_getUserDateTimeFormat( $media[$mediaObject]['upload_time'] );
  
      // build the rating bar if rating is enabled.
      if ( $MG_albums[$aid]->enable_rating > 0 ) {
***************
*** 1799,1804 ****
--- 1800,1806 ----
          'media_desc'    =>  (isset($media[$mediaObject]['media_desc']) && $media[$mediaObject]['media_desc'] != ' ' ) ? $media_desc : '',
          'artist'        =>  (isset($media[$mediaObject]['artist'])) ? $media[$mediaObject]['artist'] : '',
          'media_time'    =>  $media_date[0],
+         'upload_time'   =>  $upload_date[0],
          'media_views'   =>  ($MG_albums[$aid]->enable_views ? $media[$mediaObject]['media_views'] : ''),
          'media_comments' => ($MG_albums[$aid]->enable_comments ? $media[$mediaObject]['media_comments'] . '<br />' : ''),
          'pagination'    =>  ($sortID > 0 ? '' : generate_pic_pagination($_MG_CONF['site_url'] . "/media.php?f=" . ($full ? '1' : '0') . "&amp;sort=" . $sortOrder, $nRows, 1, $mediaObject, $media, TRUE)),