fix errors in 1.2.1

Author: MuZhou233

.gitignore

@@ -1,4 +1,5 @@
 default
 Paul
 .idea/
-typecho/
+typecho/
+postgres/

_includes/nav.php

@@ -68,9 +68,9 @@
         </div>
         <div data-tab="folder">
             <nav class="nav flex-column nav-pills">
-                <?php if(array_key_exists('MorechoCore', Typecho_Plugin::export()['activated'])): ?> 
-                <a class="nav-link <?php if(Typecho_Router::getPathInfo() == '/archive/')echo 'active' ?>"
-                    href="/archive/">全部文章</a>
+                <?php if(array_key_exists('MorechoCore', Typecho_Plugin::export()['activated'])): ?>
+                    <a class="nav-link <?php if(strtolower($_SERVER['REQUEST_URI']) == '/archive/')echo 'active' ?>"
+                       href="/archive/">全部文章</a>
                 <?php endif; ?>
                 <?php $this->widget('Widget_Metas_Category_List')->to($categories); ?>
                 <?php while($categories->next()): if($categories->parent == "0" && $categories->slug !== $this->options->hideCategory): ?>

archive.php

@@ -8,7 +8,7 @@
 if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 
 if($this->is('tag')){
-    $url = Typecho_Router::getPathInfo();
+    $url = strtolower($_SERVER['REQUEST_URI']);
     if(substr($url, -1) == '/')$url = substr($url, 0, strlen($url)-1);
     if(!array_key_exists('MorechoCore', Typecho_Plugin::export()['activated']))
         Header("Location: ".$this->options->siteUrl.'archive.html/?tag='.trim(strrchr($url, '/'),'/'));

functions.php

@@ -173,7 +173,7 @@ function get_user_group($name = NULL){
         $profile = $db->fetchRow($db->select('group', 'uid')->from('table.users')->where('uid = ?', intval(Typecho_Cookie::get('__typecho_uid'))));
     else
         $profile = $db->fetchRow($db->select('group', 'name', 'screenName')->from('table.users')->where('name=? OR screenName=?', $name, $name));
-    if(sizeof($profile) == 0) return isset($options->groupTitleV) ? $options->groupTitleV: '';
+    if(empty($profile)) return isset($options->groupTitleV) ? $options->groupTitleV: '';
     return $profile['group'];
 }
 

plugins/MorechoCore/Plugin.php

@@ -27,13 +27,13 @@ public static function activate()
     {
         Helper::addRoute('Morecho_archive_page', '/archive/', 'Widget_Archive', 'render');
         Typecho_Plugin::factory('Widget_Archive')->handle = array('MorechoCore_Plugin', 'archive');
-        Typecho_Plugin::factory('admin/header.php')->header = array('MorechoCore_Plugin', 'header');
-        Typecho_Plugin::factory('admin/footer.php')->end = array('MorechoCore_Plugin', 'footer');
-        Typecho_Plugin::factory('Widget_Abstract_Contents')->markdown = array('MorechoCore_Plugin', 'markdown');
-        Typecho_Plugin::factory('Widget_Abstract_Comments')->markdown = array('MorechoCore_Plugin', 'markdown_safemod');
-        Typecho_Plugin::factory('admin/editor-js.php')->markdownEditor = array('MorechoCore_Plugin', 'markdown_editor');
-        Typecho_Plugin::factory('admin/write-post.php')->richEditor = array('MorechoCore_Plugin', 'editor');
-        Typecho_Plugin::factory('admin/write-page.php')->richEditor = array('MorechoCore_Plugin', 'editor');
+        //Typecho_Plugin::factory('admin/header.php')->header = array('MorechoCore_Plugin', 'header');
+        //Typecho_Plugin::factory('admin/footer.php')->end = array('MorechoCore_Plugin', 'footer');
+        //Typecho_Plugin::factory('Widget_Abstract_Contents')->markdown = array('MorechoCore_Plugin', 'markdown');
+        //Typecho_Plugin::factory('Widget_Abstract_Comments')->markdown = array('MorechoCore_Plugin', 'markdown_safemod');
+        //Typecho_Plugin::factory('admin/editor-js.php')->markdownEditor = array('MorechoCore_Plugin', 'markdown_editor');
+        //Typecho_Plugin::factory('admin/write-post.php')->richEditor = array('MorechoCore_Plugin', 'editor');
+        //Typecho_Plugin::factory('admin/write-page.php')->richEditor = array('MorechoCore_Plugin', 'editor');
     }
 
     /**
@@ -113,49 +113,6 @@ public static function footer()
         $options = Helper::options();
         echo '<script src="'.$options->pluginUrl.'/MorechoCore/script.js"></script>';
     }
-
-    /**
-     * 使用 Parsedown 解析
-     * 
-     * @access public
-     * @return void
-     */
-    public static function markdown($text)
-    {
-        require_once dirname(__FILE__) . '/ParsedownExtend.php';
-        return ParsedownExtend::instance()
-            ->setBreaksEnabled(true)
-            ->text($text);
-    }
-    
-    /**
-     * 使用 Parsedown 解析（开启安全模式）
-     * 
-     * @access public
-     * @return void
-     */
-    public static function markdown_safemod($text)
-    {
-        require_once dirname(__FILE__) . '/ParsedownExtend.php';
-        return ParsedownExtend::instance()
-            ->setSafeMode(true)
-            ->setBreaksEnabled(true)
-            ->text($text);
-    }
-        
-    /**
-     * 修改markdown编辑器
-     * 
-     * @access public
-     * @return void
-     */
-    public static function editor($page)
-    {
-        Typecho_Widget::widget('Widget_Options')->to($options);
-        list($prefixVersion, $suffixVersion) = explode('/', $options->version);
-        $options->theme_folder_name = Typecho_Widget::widget('Widget_Options')->plugin('MorechoCore')->theme_folder_name;
-        require dirname(__FILE__) . '/editor-js.php';
-    }
 
     /**
      * archive页面支持