Gitblit devel
parent: 52f41d95 | patch | commit | show whitespace
James Moger
2014-01-14 3c94742aed91c1e7597e4e75d967c1d7a6bdbb84 
Merge pull request #135 from kxyfyh/branch_fixbug

修正读取默认文件语言识别
2 files modified
4 ■■■■■ changed files
src/main/java/com/gitblit/wicket/pages/MyDashboardPage.java 2 ●●●●● patch | view | raw | blame | history
src/main/java/com/gitblit/wicket/pages/RepositoriesPage.java 2 ●●●●● patch | view | raw | blame | history 
 src/main/java/com/gitblit/wicket/pages/MyDashboardPage.java


@@ -238,7 +238,7 @@


        if (!StringUtils.isEmpty(lc)) {



            if (!StringUtils.isEmpty(cc)) {



                files.add(base + "_" + lc + "-" + cc + ext);



                files.add(base + "_" + lc + "_" + cc + ext);



                files.add(base + "_" + lc + "_" + cc.toUpperCase() + ext);



            }



            files.add(base + "_" + lc + ext);



        }





 src/main/java/com/gitblit/wicket/pages/RepositoriesPage.java


@@ -150,7 +150,7 @@


        if (!StringUtils.isEmpty(lc)) {



            if (!StringUtils.isEmpty(cc)) {



                files.add(base + "_" + lc + "-" + cc + ext);



                files.add(base + "_" + lc + "_" + cc + ext);



                files.add(base + "_" + lc + "_" + cc.toUpperCase() + ext);



            }



            files.add(base + "_" + lc + ext);



        }