| 
                                                        @@ -220,7 +220,7 @@  discard block  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    220
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    220
                                                                                                                                                                                                 | 
                                                                     $surname_initials = $this->surnameInitials($surname_data);  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    221
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    221
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    222
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    222
                                                                                                                                                                                                 | 
                                                                     // We've requested a surname that doesn't currently exist.  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    223
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -        if ($surname !== ''  && !array_key_exists($surname, $all_surns)) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    223
                                                                                                                                                                                                 | 
                                                            +        if ($surname !== '' && !array_key_exists($surname, $all_surns)) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    224
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    224
                                                                                                                                                                                                 | 
                                                                         $message = I18N::translate('There are no individuals with the surname ā%sā', e($surname)); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    225
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    225
                                                                                                                                                                                                 | 
                                                                         FlashMessages::addMessage($message);  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    226
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    226
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                                                                        
                                                         | 
                                                        @@ -608,7 +608,7 @@  discard block  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    608
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    608
                                                                                                                                                                                                 | 
                                                                         ->groupBy([$this->binaryColumn('n_givn')]); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    609
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    609
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    610
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    610
                                                                                                                                                                                                 | 
                                                                     foreach ($query->get() as $row) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    611
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -            $initial            = I18N::strtoupper(I18N::language()->initialLetter($row->n_givn));  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    611
                                                                                                                                                                                                 | 
                                                            +            $initial = I18N::strtoupper(I18N::language()->initialLetter($row->n_givn));  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    612
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    612
                                                                                                                                                                                                 | 
                                                                         $initials[$initial] ??= 0;  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    613
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    613
                                                                                                                                                                                                 | 
                                                                         $initials[$initial] += (int) $row->count;  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    614
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    614
                                                                                                                                                                                                 | 
                                                                     }  | 
                                                        
                                                                                                                                                
                                         
                                        
                                            
                                                                                                    Please login to merge, or discard this patch.