| 
                                                        @@ -173,8 +173,8 @@  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    173
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    173
                                                                                                                                                                                                 | 
                                                                  */  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    174
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    174
                                                                                                                                                                                                 | 
                                                                 protected function _getAdminFrontname() { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    175
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    175
                                                                                                                                                                                                 | 
                                                                     if (Mage::getStoreConfig('admin/url/use_custom_path')) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    176
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -            if(Mage::getStoreConfig('web/url/use_store')) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    177
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -                return Mage::getModel('core/store')->load(0)->getCode() . "/" . Mage::getStoreConfig('admin/url/custom_path'); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    176
                                                                                                                                                                                                 | 
                                                            +            if (Mage::getStoreConfig('web/url/use_store')) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    177
                                                                                                                                                                                                 | 
                                                            +                return Mage::getModel('core/store')->load(0)->getCode()."/".Mage::getStoreConfig('admin/url/custom_path'); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    178
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    178
                                                                                                                                                                                                 | 
                                                                         } else { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    179
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    179
                                                                                                                                                                                                 | 
                                                                             return Mage::getStoreConfig('admin/url/custom_path'); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    180
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    180
                                                                                                                                                                                                 | 
                                                                         }  | 
                                                        
                                                                                                                                                
                                         
                                        
                                            
                                                                                                    Please login to merge, or discard this patch.