| 
                                                        @@ -155,7 +155,7 @@  discard block  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    155
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    155
                                                                                                                                                                                                 | 
                                                             <?php  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    156
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    156
                                                                                                                                                                                                 | 
                                                             foreach ($opt['template']['locales'] as $k => $lang) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    157
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    157
                                                                                                                                                                                                 | 
                                                                 if ($lang['status'] == OC_LOCALE_ACTIVE) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    158
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -        echo '<a style="text-decoration: none;" href="'.$langUrl . $k . '"><img src="' . $lang['flag'] .  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    158
                                                                                                                                                                                                 | 
                                                            +        echo '<a style="text-decoration: none;" href="' . $langUrl . $k . '"><img src="' . $lang['flag'] .  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    159
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    159
                                                                                                                                                                                                 | 
                                                                         '" alt="' . $lang['name'] . '" title="' . $lang['name'] . '" width="24px" height="18px" /></a> ';  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    160
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    160
                                                                                                                                                                                                 | 
                                                                 }  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    161
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    161
                                                                                                                                                                                                 | 
                                                             }  | 
                                                        
                                                                                                                                                        
                                                         | 
                                                        @@ -185,7 +185,7 @@  discard block  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    185
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    185
                                                                                                                                                                                                 | 
                                                                                                     }  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    186
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    186
                                                                                                                                                                                                 | 
                                                                                                     $nLastGroup = $tpl_usercountries[$i]['group'];  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    187
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    187
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    188
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -                                        echo '<option value="' . htmlspecialchars($tpl_usercountries[$i]['country'], ENT_COMPAT, 'UTF-8') . '"' . (($sUserCountry==$tpl_usercountries[$i]['country']) ? ' selected="selected"' : '') . '>' . htmlspecialchars($tpl_usercountries[$i]['name'], ENT_COMPAT, 'UTF-8') . '</option>';  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    188
                                                                                                                                                                                                 | 
                                                            +                                        echo '<option value="' . htmlspecialchars($tpl_usercountries[$i]['country'], ENT_COMPAT, 'UTF-8') . '"' . (($sUserCountry == $tpl_usercountries[$i]['country']) ? ' selected="selected"' : '') . '>' . htmlspecialchars($tpl_usercountries[$i]['name'], ENT_COMPAT, 'UTF-8') . '</option>';  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    189
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    189
                                                                                                                                                                                                 | 
                                                                                                 }  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    190
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    190
                                                                                                                                                                                                 | 
                                                             ?>  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    191
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    191
                                                                                                                                                                                                 | 
                                                                                             </select>  | 
                                                        
                                                                                                                                                        
                                                         | 
                                                        @@ -390,7 +390,7 @@  discard block  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    390
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    390
                                                                                                                                                                                                 | 
                                                                         </div> <!-- page-container-1 -->  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    391
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    391
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    392
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    392
                                                                                                                                                                                                 | 
                                                                     </div> <!-- overall -->  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    393
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -        <?php if($opt['tracking']['googleAnalytics']) { ?> | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    393
                                                                                                                                                                                                 | 
                                                            +        <?php if ($opt['tracking']['googleAnalytics']) { ?> | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    394
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    394
                                                                                                                                                                                                 | 
                                                                         <script type="text/javascript">  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    395
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    395
                                                                                                                                                                                                 | 
                                                                             // Set to the same value as the web property used on the site  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    396
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    396
                                                                                                                                                                                                 | 
                                                                             var gaProperty = '<?= $opt['tracking']['googleAnalytics']; ?>';  | 
                                                        
                                                                                                                                                
                                         
                                        
                                            
                                                                                                    Please login to merge, or discard this patch.