diff --git a/include/functions.php b/include/functions.php index 76759136..f36f789a 100644 --- a/include/functions.php +++ b/include/functions.php @@ -2836,6 +2836,7 @@ if ($msgalert) function stdfoot() { global $SITENAME,$BASEURL,$Cache,$datefounded,$tstart,$icplicense_main,$add_key_shortcut,$query_name, $USERUPDATESET, $CURUSER, $enablesqldebug_tweak, $sqldebug_tweak, $Advertisement, $analyticscode_tweak; + global $hook; print(""); print("
"); if ($Advertisement->enable_ad()){ @@ -2880,6 +2881,7 @@ function stdfoot() { print("
"); if ($analyticscode_tweak) print("\n".$analyticscode_tweak."\n"); +// $hook->dump(); do_action('nexus_footer'); foreach (\Nexus\Nexus::getAppendFooters() as $value) { print($value); diff --git a/nexus/Nexus.php b/nexus/Nexus.php index 0cbf8cd5..a7edb2f9 100644 --- a/nexus/Nexus.php +++ b/nexus/Nexus.php @@ -244,16 +244,22 @@ final class Nexus private static function appendJsCss($append, $position, $key = null) { + $log = "position: $position, key: $key"; if ($key === null) { $key = md5($append); + $log .= ", md5 key: $key"; } if ($position == 'header') { if (!isset(self::$appendHeaders[$key])) { self::$appendHeaders[$key] = $append; + } else { + do_log("$log, [DUPLICATE]"); } } elseif ($position == 'footer') { if (!isset(self::$appendFooters[$key])) { self::$appendFooters[$key] = $append; + } else { + do_log("$log, [DUPLICATE]"); } } else { throw new \InvalidArgumentException("Invalid position: $position"); diff --git a/public/forums.php b/public/forums.php index 41491038..131a01c2 100644 --- a/public/forums.php +++ b/public/forums.php @@ -870,7 +870,6 @@ if ($action == "viewtopic") else print($lang_forums['text_unpermitted_posting_here']); print(key_shortcut($page,$pages-1)); - do_action('page_forums_js'); stdfoot(); die; } diff --git a/resources/lang/en/label.php b/resources/lang/en/label.php index a7cd8e4b..d1812ff0 100644 --- a/resources/lang/en/label.php +++ b/resources/lang/en/label.php @@ -31,6 +31,7 @@ return [ 'operator' => 'Operator', 'action' => 'Action', 'submit' => 'Submit', + 'cancel' => 'Cancel', 'reset' => 'Reset', 'setting' => [ 'nav_text' => 'Setting', diff --git a/resources/lang/zh_CN/label.php b/resources/lang/zh_CN/label.php index 2c38b793..7c00c281 100644 --- a/resources/lang/zh_CN/label.php +++ b/resources/lang/zh_CN/label.php @@ -31,6 +31,7 @@ return [ 'operator' => '操作者', 'action' => '操作', 'submit' => '提交', + 'cancel' => '取消', 'reset' => '重置', 'setting' => [ 'nav_text' => '设置', diff --git a/resources/lang/zh_TW/label.php b/resources/lang/zh_TW/label.php index e1673879..8142fe4f 100644 --- a/resources/lang/zh_TW/label.php +++ b/resources/lang/zh_TW/label.php @@ -31,6 +31,7 @@ return [ 'operator' => '操作者', 'action' => '操作', 'submit' => '提交', + 'cancel' => '取消', 'reset' => '重置', 'setting' => [ 'nav_text' => '設置',