Merge branch 'master' of github.com:typecho/typecho

minisin · Nov 20, 2014 · 4bb88fa · 4bb88fa
2 parents 8fa7ddc + b0c4cc7
commit 4bb88fa
Show file tree

Hide file tree

Showing 51 changed files with 7,203 additions and 5,872 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "usr/langs"]
-	path = usr/langs
-	url = https://github.com/typecho/languages.git

diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,12 @@
 language: php
 
 php:
+  - 5.6
   - 5.5
   - 5.4
   - 5.3
+  - 5.2
+  - hhvm
 
-script: cd ./tools/ && make all
+script: cd ./tools/ && set -e && make test
 
diff --git a/admin/common-js.php b/admin/common-js.php
@@ -13,8 +13,7 @@
                         noticeType  :   $.cookie(prefix + '__typecho_notice_type'),
                         highlight   :   $.cookie(prefix + '__typecho_notice_highlight')
                     },
-                    path = '<?php $parts = parse_url($options->siteUrl);
-                        echo empty($parts['path']) ? '/' : $parts['path']; ?>';
+                    path = '<?php echo Typecho_Cookie::getPath(); ?>';
 
                 if (!!cookies.notice && 'success|notice|error'.indexOf(cookies.noticeType) >= 0) {
                     var head = $('.typecho-head-nav'),