[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gallery-checkins
Subject:    [Gallery-checkins] CVS: gallery ChangeLog,1.249.2.1,1.249.2.2 Version.php,1.79.2.1,1.79.2.2 albums.p
From:       Bharat Mediratta <bharat () users ! sourceforge ! net>
Date:       2002-10-31 2:45:22
[Download RAW message or body]

Update of /cvsroot/gallery/gallery
In directory usw-pr-cvs1:/tmp/cvs-serv9150

Modified Files:
      Tag: albumdb-refactor-branch
	ChangeLog Version.php albums.php 
Log Message:
2002-10-30  Bharat Mediratta  <bharat@menalto.com> 1.3.2-cvs-albumdb-refactor-branch-b2 
 
        * Minor tweak: if the full name is empty, display the username in the 
          "Welcome, xxx" message on albums.php 
 


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gallery/gallery/ChangeLog,v
retrieving revision 1.249.2.1
retrieving revision 1.249.2.2
diff -u -r1.249.2.1 -r1.249.2.2
--- ChangeLog	23 Oct 2002 05:30:44 -0000	1.249.2.1
+++ ChangeLog	31 Oct 2002 02:45:19 -0000	1.249.2.2
@@ -1,3 +1,8 @@
+2002-10-30  Bharat Mediratta  <bharat@menalto.com> 1.3.2-cvs-albumdb-refactor-branch-b2
+
+	* Minor tweak: if the full name is empty, display the username in the
+	  "Welcome, xxx" message on albums.php
+
 2002-10-22  Bharat Mediratta  <bharat@menalto.com> 1.3.2-cvs-albumdb-refactor-branch-b1
 
 	* Integrated Jesse Mullan's albumdb refactoring code in a separate

Index: Version.php
===================================================================
RCS file: /cvsroot/gallery/gallery/Version.php,v
retrieving revision 1.79.2.1
retrieving revision 1.79.2.2
diff -u -r1.79.2.1 -r1.79.2.2
--- Version.php	23 Oct 2002 05:30:44 -0000	1.79.2.1
+++ Version.php	31 Oct 2002 02:45:19 -0000	1.79.2.2
@@ -38,7 +38,7 @@
 	$gallery = new stdClass();
 }
 
-$gallery->version = "1.3.2-cvs-albumdb-refactor-branch-b1";
+$gallery->version = "1.3.2-cvs-albumdb-refactor-branch-b2";
 $gallery->config_version = 31;
 $gallery->album_version = 6;
 $gallery->remote_protocol_version = 1;

Index: albums.php
===================================================================
RCS file: /cvsroot/gallery/gallery/albums.php,v
retrieving revision 1.63.2.1
retrieving revision 1.63.2.2
diff -u -r1.63.2.1 -r1.63.2.2
--- albums.php	23 Oct 2002 05:30:44 -0000	1.63.2.1
+++ albums.php	31 Oct 2002 02:45:19 -0000	1.63.2.2
@@ -104,7 +104,11 @@
 $adminCommands = "<span class=\"admin\">";
 
 if ($gallery->user->isLoggedIn()) {
-	$adminCommands .= "Welcome, " . $gallery->user->getFullname() . "&nbsp;&nbsp;<br>";
+	$displayName = $gallery->user->getFullname();
+	if (empty($displayName)) {
+		$displayName = $gallery->user->getUsername();
+	}
+	$adminCommands .= "Welcome, $displayName &nbsp;&nbsp;<br>";
 }
 
 if ($gallery->user->canCreateAlbums()) { 



-------------------------------------------------------
This sf.net email is sponsored by: Influence the future 
of Java(TM) technology. Join the Java Community 
Process(SM) (JCP(SM)) program now. 
http://ads.sourceforge.net/cgi-bin/redirect.pl?sunm0004en
__[ g a l l e r y - c h e c k i n s ]_________________________

[ list info/archive --> http://gallery.sf.net/lists.php ]
[ gallery info/FAQ/download --> http://gallery.sf.net ]
[prev in list] [next in list] [prev in thread] [next in thread]