| 
                                                        @@ -824,7 +824,7 @@  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    824
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    824
                                                                                                                                                                                                 | 
                                                                  * @param string $url           url to download  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    825
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    825
                                                                                                                                                                                                 | 
                                                                  * @param string $file          path to file or directory where to save  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    826
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    826
                                                                                                                                                                                                 | 
                                                                  * @param string $defaultName   fallback for name of download  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    827
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -     * @return bool|string          if failed false, otherwise true or the name of the file in the given dir  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    827
                                                                                                                                                                                                 | 
                                                            +     * @return false|string          if failed false, otherwise true or the name of the file in the given dir  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    828
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    828
                                                                                                                                                                                                 | 
                                                                  */  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    829
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    829
                                                                                                                                                                                                 | 
                                                                 protected function downloadToFile($url,$file,$defaultName=''){ | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    830
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    830
                                                                                                                                                                                                 | 
                                                                     global $conf;  | 
                                                        
                                                                                                                                                
                                         
                                        
                                            
                                                                                                    Please login to merge, or discard this patch.