From e4e0ace9a9768764b8dae17e214ab50888368c34 Mon Sep 17 00:00:00 2001
From: Desmond Stonie <aneasystone@gmail.com>
Date: Sat, 27 Jun 2015 12:39:01 +0800
Subject: [PATCH 1/2] in some SAE environment, SAE constants like SAE_MYSQL_DB
 have been defined but not been initialized

---
 install/Mysql.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/Mysql.php b/install/Mysql.php
index dac68993..64e27b26 100644
--- a/install/Mysql.php
+++ b/install/Mysql.php
@@ -3,7 +3,7 @@
 <?php
 $engine = '';
 
-if (defined('SAE_MYSQL_DB')) {
+if (defined('SAE_MYSQL_DB') && SAE_MYSQL_DB != "app_") {
     $engine = 'SAE';
 } else if (!!getenv('HTTP_BAE_ENV_ADDR_SQL_IP')) {
     $engine = 'BAE';

From 53a2ce64b4d630f0d82474fa9bcc5206d7aa6995 Mon Sep 17 00:00:00 2001
From: Desmond Stonie <aneasystone@gmail.com>
Date: Sat, 27 Jun 2015 12:41:22 +0800
Subject: [PATCH 2/2] __TYPECHO_MB_SUPPORTED__ needs mb_get_info and
 mb_regex_encoding all exist

---
 var/Typecho/Common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/var/Typecho/Common.php b/var/Typecho/Common.php
index 26c3e660..e631ec1f 100644
--- a/var/Typecho/Common.php
+++ b/var/Typecho/Common.php
@@ -9,7 +9,7 @@
  * @version $Id$
  */
 
-define('__TYPECHO_MB_SUPPORTED__', function_exists('mb_get_info'));
+define('__TYPECHO_MB_SUPPORTED__', function_exists('mb_get_info') && function_exists('mb_regex_encoding'));
 
 /**
  * Typecho公用方法