models/user/setting.go

@@ -10,7 +10,6 @@ import (
 
 	"code.gitea.io/gitea/models/db"
 	"code.gitea.io/gitea/modules/cache"
-	setting_module "code.gitea.io/gitea/modules/setting"
 
 	"xorm.io/builder"
 )
@@ -155,16 +154,11 @@ func SetUserSetting(userID int64, key, value string) error {
 		return err
 	}
 
-	if err := upsertUserSettingValue(userID, key, value); err != nil {
+	_, err := cache.GetString(genSettingCacheKey(userID, key), func() (string, error) {
-		return err
+		return value, upsertUserSettingValue(userID, key, value)
-	}
+	})
 
-	cc := cache.GetCache()
+	return err
-	if cc != nil {
-		return cc.Put(genSettingCacheKey(userID, key), value, setting_module.CacheService.TTLSeconds())
-	}
-
-	return nil
 }
 
 func upsertUserSettingValue(userID int64, key, value string) error {

web_src/js/features/common-global.js

@@ -7,7 +7,6 @@ import {showGlobalErrorMessage} from '../bootstrap.js';
 import {attachDropdownAria} from './aria.js';
 import {handleGlobalEnterQuickSubmit} from './comp/QuickSubmit.js';
 import {initTooltip} from '../modules/tippy.js';
-import {svg} from '../svg.js';
 
 const {appUrl, csrfToken} = window.config;
 
@@ -170,10 +169,10 @@ export function initGlobalDropzone() {
           $dropzone.find('.files').append(input);
           // Create a "Copy Link" element, to conveniently copy the image
           // or file link as Markdown to the clipboard
-          const copyLinkElement = document.createElement('div');
+          const copyLinkElement = document.createElement('a');
-          copyLinkElement.className = 'tc';
+          copyLinkElement.className = 'dz-remove';
-          // The a element has a hardcoded cursor: pointer because the default is overridden by .dropzone
+          copyLinkElement.href = '#';
-          copyLinkElement.innerHTML = `<a href="#" style="cursor: pointer;">${svg('octicon-copy', 14, 'copy link')} Copy link</a>`;
+          copyLinkElement.innerHTML = '<i class="fa fa-copy"></i> Copy link';
           copyLinkElement.addEventListener('click', (e) => {
             e.preventDefault();
             let fileMarkdown = `[${file.name}](/attachments/${file.uuid})`;