Merge pull request #16 from Stitch-June/master

Player626 · web-flow · commit 49328f4c8766 · 2021-12-13T21:15:27.000+08:00
2.x
diff --git a/lib/SmtpService.php b/lib/SmtpService.php
@@ -168,9 +168,9 @@ private function getWidget($table, $key, $val)
     {
         $className = 'Widget_Abstract_' . $table;
         $db = Typecho_Db::get();
-        $widget = new $className(Typecho_Request::getInstance(), Typecho_Widget_Helper_Empty::getInstance());
+        $widget = $className::alloc();
         $db->fetchRow($widget->select()->where($key . ' = ?', $val)->limit(1), array($widget, 'push'));
 
         return $widget;
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -168,9 +168,9 @@ private function getWidget($table, $key, $val)`
`168`	`168`	`{`
`169`	`169`	`$className = 'Widget_Abstract_' . $table;`
`170`	`170`	`$db = Typecho_Db::get();`
`171`		`- $widget = new $className(Typecho_Request::getInstance(), Typecho_Widget_Helper_Empty::getInstance());`
	`171`	`+ $widget = $className::alloc();`
`172`	`172`	`$db->fetchRow($widget->select()->where($key . ' = ?', $val)->limit(1), array($widget, 'push'));`
`173`	`173`
`174`	`174`	`return $widget;`
`175`	`175`	`}`
`176`		`-}`
	`176`	`+}`