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

Author: fen

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "usr/langs"]
-	path = usr/langs
-	url = https://github.com/typecho/languages.git

.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
 

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'),