--- templates/edit_file_gallery.tpl	2009/12/16 09:58:38	23907
+++ templates/edit_file_gallery.tpl	2010/01/10 14:33:50	24242
@@ -48,7 +48,7 @@
             <option value="{$prefs.fgal_root_id}"{if $parentId eq $prefs.fgal_root_id} selected="selected"{/if}>{tr}none{/tr}</option>
             {foreach from=$all_galleries key=key item=item}
 							{if $galleryId neq $item.id}
-              <option value="{$item.id}"{if $parentId eq $item.id} selected="selected"{/if}>{if $item.parentName}{$item.parentName|escape} &gt; {/if}{$item.name|escape}</option>
+              <option value="{$item.id}"{if $parentId eq $item.id} selected="selected"{/if}>{$item.label|escape}</option>
 							{/if}
             {/foreach}
           </select>
--- tiki-user_preferences.php	2009/12/15 20:04:03	23893
+++ tiki-user_preferences.php	2010/01/10 17:04:06	24243
@@ -158,7 +158,13 @@
 	foreach($customfields as $custpref => $prefvalue) {
 		if (isset($_REQUEST[$customfields[$custpref]['prefName']])) $tikilib->set_user_preference($userwatch, $customfields[$custpref]['prefName'], $_REQUEST[$customfields[$custpref]['prefName']]);
 	}
-	if (isset($_REQUEST["realName"]) && ($prefs['auth_ldap_nameattr'] == '' || $prefs['auth_method'] != 'ldap')) $tikilib->set_user_preference($userwatch, 'realName', $_REQUEST["realName"]);
+	if (isset($_REQUEST["realName"]) && ($prefs['auth_ldap_nameattr'] == '' || $prefs['auth_method'] != 'ldap')) {
+     $tikilib->set_user_preference($userwatch, 'realName', $_REQUEST["realName"]);
+     if ( $prefs['user_show_realnames'] == 'y' ) {
+       global $cachelib;
+       $cachelib->invalidate('userlink.'.$user.'0');
+     }
+   }
 	if ($prefs['feature_community_gender'] == 'y') {
 		if (isset($_REQUEST["gender"])) $tikilib->set_user_preference($userwatch, 'gender', $_REQUEST["gender"]);
 	}
--- tiki-calendar_edit_item.php	2009/12/07 22:57:47	23725
+++ tiki-calendar_edit_item.php	2010/01/10 22:50:48	24246
@@ -265,14 +265,13 @@
 					$save['changed'] = true;
 				}
 				$calitemId = $calendarlib->set_item($user,$save['calitemId'],$save);
-			}
 
-			if ($prefs['feature_groupalert'] == 'y') {
-				$groupalertlib->Notify($_REQUEST['listtoalert'],"tiki-calendar_edit_item.php?viewcalitemId=".$calitemId);
+            if ($prefs['feature_groupalert'] == 'y') {
+              $groupalertlib->Notify($_REQUEST['listtoalert'],"tiki-calendar_edit_item.php?viewcalitemId=".$calitemId);
+            }
+            header('Location: tiki-calendar.php?todate='.$save['start']);
+            die;
 			}
-
-			header('Location: tiki-calendar.php?todate='.$save['start']);
-			die;
 		}
 	}
 }