diff options
| -rw-r--r-- | models/repo.go | 7 | ||||
| -rw-r--r-- | public/js/index.js | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/models/repo.go b/models/repo.go index ce9740f8c4..b4f4935803 100644 --- a/models/repo.go +++ b/models/repo.go @@ -691,7 +691,6 @@ func MigrateRepository(u *User, opts MigrateRepoOptions) (*Repository, error) { wikiRemotePath := wikiRemoteURL(opts.RemoteAddr) if len(wikiRemotePath) > 0 { - if err := os.RemoveAll(wikiPath); err != nil { return repo, fmt.Errorf("Fail to remove %s: %v", wikiPath, err) } @@ -700,8 +699,12 @@ func MigrateRepository(u *User, opts MigrateRepoOptions) (*Repository, error) { Mirror: true, Quiet: true, Timeout: migrateTimeout, + Branch: "master", }); err != nil { - log.Info("Clone wiki: %v", err) + log.Warn("Clone wiki: %v", err) + if err := os.RemoveAll(wikiPath); err != nil { + return repo, fmt.Errorf("Fail to remove %s: %v", wikiPath, err) + } } } diff --git a/public/js/index.js b/public/js/index.js index 214308ef43..590fafa8d8 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -1347,7 +1347,7 @@ $(document).ready(function () { var headers = {}; $(this).find('h1, h2, h3, h4, h5, h6').each(function () { var node = $(this); - var val = encodeURIComponent(node.text().toLowerCase().replace(/[^\w\- ]/g, '').replace(/[ ]/g, '-')); + var val = encodeURIComponent(node.text().toLowerCase().replace(/[^\u00C0-\u1FFF\u2C00-\uD7FF\w\- ]/g, '').replace(/[ ]/g, '-')); var name = val; if (headers[val] > 0) { name = val + '-' + headers[val]; |