Merge pull request #2 from typecho/master

同步

admin/js/markdown.js

@@ -4860,7 +4860,7 @@ else
                         if (isImage) {
                             var imagename = that.getString("imagename");
                             if (!!imagename) {
-                                imagename = imagename.replace('_', '\\_');
+                                imagename = imagename.replace(/_/g, '\\_');
                             }
 
                             chunk.selection = imagename || that.getString("imagedescription");
@@ -4868,7 +4868,7 @@ else
                         else {
                             var linkname = that.getString("linkname");
                             if (!!linkname) {
-                                linkname = linkname.replace('_', '\\_');
+                                linkname = linkname.replace(/_/g, '\\_');
                             }
 
                             chunk.selection = linkname || that.getString("linkdescription");

admin/scss/_icons.scss

@@ -3,10 +3,14 @@
  */
 
 $icons: sprite-map("icons/*.png");
+$icons-2x: sprite-map("icons-2x/*.png");
 
 .icon-sprite-hack {
   background: $icons;
 }
+// .icon-2x-sprite-hack {
+//   background: $icons-2x;
+// }
 
 %i-16 {
   width: 16px;

tools/Makefile

@@ -25,6 +25,7 @@ package:
 	rm -Rf build/admin/scss
 	rm -Rf build/admin/img/editor
 	rm -Rf build/admin/img/icons
+	rm -Rf build/admin/img/icons-2x
 	mkdir build/usr/uploads/
 	chmod 777 build/usr/uploads/
 	tar -cvvzf build.tar.gz build/
@@ -65,6 +66,7 @@ install:
 	rm -Rf build/admin/scss
 	rm -Rf build/admin/img/editor
 	rm -Rf build/admin/img/icons
+	rm -Rf build/admin/img/icons-2x
 	mkdir build/usr/uploads/
 	chmod 777 build/usr/uploads/
 	cp -Rf build/* ${DIR}

var/Typecho/Request.php

@@ -640,7 +640,7 @@ class Typecho_Request
      */
     public function isSecure()
     {
-        return 'on' == $this->getServer('HTTPS') || 443 == $this->getServer('SERVER_PORT');
+        return (isset($_SERVER['HTTPS']) && 'on' == $_SERVER['HTTPS']) || (isset($_SERVER['SERVER_PORT']) && 443 == $_SERVER['SERVER_PORT']);
     }
 
     /**
@@ -665,6 +665,19 @@ class Typecho_Request
         return 'Shockwave Flash' == $this->getServer('USER_AGENT');
     }
 
+    /**
+     * isMobile  
+     * 
+     * @static
+     * @access public
+     * @return boolean
+     */
+    public function isMobile()
+    {
+        $userAgent = $this->getAgent();
+        return preg_match('/android.+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i',$userAgent) || preg_match('/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(di|rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i',substr($userAgent,0,4));
+    }
+
     /**
      * 判断输入是否满足要求
      *
@@ -687,11 +700,7 @@ class Typecho_Request
         if ($params) {
             $validated = true;
             foreach ($params as $key => $val) {
-                if (empty($val)) {
-                    $validated = $this->__isSet($key);
-                } else {
-                    $validated = ($this->get($key) == $val);
-                }
+                $validated = empty($val) ? $this->__isset($key) : ($val == $this->get($key));
 
                 if (!$validated) {
                     break;

var/Widget/Abstract/Contents.php

@@ -70,7 +70,7 @@ class Widget_Abstract_Contents extends Widget_Abstract
      */
     protected function ___description()
     {
-        $plainTxt = trim(strip_tags($this->text));
+        $plainTxt = str_replace("\n", '', trim(strip_tags($this->excerpt)));
         $plainTxt = $plainTxt ? $plainTxt : $this->title;
         return Typecho_Common::subStr($plainTxt, 0, 100, '...');
     }

var/Widget/Themes/Edit.php

@@ -134,7 +134,7 @@ class Widget_Themes_Edit extends Widget_Abstract_Options implements Widget_Inter
         $this->widget('Widget_Notice')->set(_t("外观设置已经保存"), NULL, 'success');
 
         /** 转向原页 */
-        $this->response->redirect(Typecho_Common::url('themes.php', $this->options->adminUrl));
+        $this->response->redirect(Typecho_Common::url('options-theme.php', $this->options->adminUrl));
     }
 
     /**