aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/exception
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-11-14 20:39:57 +0100
committerMarc Alexander <admin@m-a-styles.de>2019-11-14 20:39:57 +0100
commit0641c209d73d56cbbb00e7f8bc4b64c8a0c9f902 (patch)
tree5dc02515137ba4e34288197188e558a3793eb3f7 /phpBB/phpbb/exception
parent04204c7ec6ecb2572cb41727140ae7c7644a4c63 (diff)
parentdba351702dbcd2dd157e8429199609fa27beee7d (diff)
downloadforums-0641c209d73d56cbbb00e7f8bc4b64c8a0c9f902.tar
forums-0641c209d73d56cbbb00e7f8bc4b64c8a0c9f902.tar.gz
forums-0641c209d73d56cbbb00e7f8bc4b64c8a0c9f902.tar.bz2
forums-0641c209d73d56cbbb00e7f8bc4b64c8a0c9f902.tar.xz
forums-0641c209d73d56cbbb00e7f8bc4b64c8a0c9f902.zip
Merge pull request #5736 from marc1706/ticket/16210
[ticket/16210] Ensure terms of use is not skipped by enforcing form token
Diffstat (limited to 'phpBB/phpbb/exception')
0 files changed, 0 insertions, 0 deletions
alue='reload'/>
authorOlivier Blin <oblin@mandriva.com>2007-12-21 10:44:02 +0000
committerOlivier Blin <oblin@mandriva.com>2007-12-21 10:44:02 +0000
commit8ea20669836f15196d3f9f5a5c9a83c63bb46d7a (patch)
treefb69a92f3de62947c2fbf1054a05f9e17fc2d136 /rescue
parent299e394053a53d1c5aff28b503aab5edd02e0047 (diff)
downloaddrakx-8ea20669836f15196d3f9f5a5c9a83c63bb46d7a.tar
drakx-8ea20669836f15196d3f9f5a5c9a83c63bb46d7a.tar.gz
drakx-8ea20669836f15196d3f9f5a5c9a83c63bb46d7a.tar.bz2
drakx-8ea20669836f15196d3f9f5a5c9a83c63bb46d7a.tar.xz
drakx-8ea20669836f15196d3f9f5a5c9a83c63bb46d7a.zip
remove KDE autostart files that should have been migrated by startkde...
Diffstat (limited to 'rescue')
-rwxr-xr-xrescue/Flash/scripts/upgrade3
1 files changed, 3 insertions, 0 deletions
diff --git a/rescue/Flash/scripts/upgrade b/rescue/Flash/scripts/upgrade
index d5ec8fb9a..21b69cf2f 100755
--- a/rescue/Flash/scripts/upgrade
+++ b/rescue/Flash/scripts/upgrade
@@ -180,6 +180,9 @@ function merge_config_files() {
#- remove KDE sessions file so that previous compiz usage does not break session
rm -f $tmpdir/union/home/*/.kde/share/config/ksmserverrc &>/dev/null
+ #- remove KDE autostart files that should have been migrated by startkde...
+ rm -f $tmpdir/union/home/*/.kde/Autostart/{alignment-icons,openkmenu}.desktop &>/dev/null
+
return 0
}