From 50dea3fc246e190fe0cafc2391df9b4d9373a74e Mon Sep 17 00:00:00 2001
From: joyqi <joyqi@segmentfault.com>
Date: Wed, 1 Sep 2021 18:45:59 +0800
Subject: [PATCH] fix plugin namespace

---
 usr/plugins/HelloWorld/Plugin.php | 2 +-
 var/Typecho/Plugin.php            | 4 ++--
 var/Widget/Options.php            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/usr/plugins/HelloWorld/Plugin.php b/usr/plugins/HelloWorld/Plugin.php
index 74837fdc..130f3e77 100644
--- a/usr/plugins/HelloWorld/Plugin.php
+++ b/usr/plugins/HelloWorld/Plugin.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace HellWorld;
+namespace HelloWorld;
 
 use Typecho\Plugin\PluginInterface;
 use Typecho\Widget\Helper\Form;
diff --git a/var/Typecho/Plugin.php b/var/Typecho/Plugin.php
index 4391248e..651d485f 100644
--- a/var/Typecho/Plugin.php
+++ b/var/Typecho/Plugin.php
@@ -348,10 +348,10 @@ class Plugin
     {
         switch (true) {
             case file_exists($pluginFileName = $path . '/' . $pluginName . '/Plugin.php'):
-                $className = $pluginName . '_Plugin';
+                $className = "\\{$pluginName}\Plugin";
                 break;
             case file_exists($pluginFileName = $path . '/' . $pluginName . '.php'):
-                $className = $pluginName;
+                $className = "\\{$pluginName}";
                 break;
             default:
                 throw new PluginException('Missing Plugin ' . $pluginName, 404);
diff --git a/var/Widget/Options.php b/var/Widget/Options.php
index 129dec18..f1a0fa44 100644
--- a/var/Widget/Options.php
+++ b/var/Widget/Options.php
@@ -256,7 +256,7 @@ class Options extends Base
      */
     public function pluginDir(?string $plugin = null): string
     {
-        return Common::url($plugin, __TYPECHO_ROOT_DIR__ . '/' . __TYPECHO_PLUGIN_DIR__);
+        return __TYPECHO_ROOT_DIR__ . '/' . __TYPECHO_PLUGIN_DIR__;
     }
 
     /**