lkddi/nexusphp
1
0
Fork 0
mirror of https://github.com/lkddi/nexusphp.git synced 2026-04-20 17:37:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

merge pr

Browse Source
This commit is contained in:
xiaomlove
2023-06-13 01:53:58 +08:00
parent 48df2f3da3
commit 2b56de2a01
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Console/Commands/Test.php
+1 -2
View File
@@ -97,8 +97,7 @@ class Test extends Command
*/
public function handle()
{
$r = TorrentUpdated::dispatch(5);
dd($r);
}
}
app/Repositories/MedalRepository.php
+6
View File
@@ -84,6 +84,12 @@ class MedalRepository extends BaseRepository
}
$current = $userMedal->status;
if ($current == UserMedal::STATUS_NOT_WEARING) {
$maxWearAllow = Setting::get('system.maximum_number_of_medals_can_be_worn');
$user = User::query()->findOrFail($userId, User::$commonFields);
$wearCount = $user->wearing_medals()->count();
if ($maxWearAllow && $wearCount >= $maxWearAllow) {
throw new NexusException(nexus_trans('medal.max_allow_wearing', ['count' => $maxWearAllow]));
}
$userMedal->status = UserMedal::STATUS_WEARING;
} elseif ($current == UserMedal::STATUS_WEARING) {
$userMedal->status = UserMedal::STATUS_NOT_WEARING;
include/constants.php
+1 -1
View File
@@ -1,6 +1,6 @@
<?php
defined('VERSION_NUMBER') || define('VERSION_NUMBER', '1.8.4');
defined('RELEASE_DATE') || define('RELEASE_DATE', '2023-06-12');
defined('RELEASE_DATE') || define('RELEASE_DATE', '2023-06-13');
defined('IN_TRACKER') || define('IN_TRACKER', false);
defined('PROJECTNAME') || define("PROJECTNAME","NexusPHP");
defined('NEXUSPHPURL') || define("NEXUSPHPURL","https://nexusphp.org");
public/modtask.php
+1 -1
View File
@@ -115,7 +115,7 @@ if ($action == "edituser")
}
if ($arr['username'] != $username){
$updateset[] = "username = " . sqlesc($username);
$modcomment = date("Y-m-d") . " - Username changed from $arr[username] to $username by {$CURUSER['username']}.\n". $modcomment;
$modcomment = date("Y-m-d") . " - Username changed from {$arr['username']} to $username by {$CURUSER['username']}.\n". $modcomment;
$subject = sqlesc($lang_modtask_target[get_user_lang($userid)]['msg_username_change']);
$msg = sqlesc($lang_modtask_target[get_user_lang($userid)]['msg_your_username_changed_from'].$arr['username'].$lang_modtask_target[get_user_lang($userid)]['msg_to_new'] . $username .$lang_modtask_target[get_user_lang($userid)]['msg_by'].$CURUSER['username']);
sql_query("INSERT INTO messages (sender, receiver, subject, msg, added) VALUES(0, $userid, $subject, $msg, $added)") or sqlerr(__FILE__, __LINE__);