Some install / upgrade logic was broken.
jdarwood007

jdarwood007 commited on 2023-09-22 16:44:12
Showing 1 changed files, with 10 additions and 8 deletions.

... ...
@@ -3,7 +3,7 @@
3 3
 <package-info xmlns="http://www.simplemachines.org/xml/package-info" xmlns:smf="http://www.simplemachines.org/">
4 4
 	<id>SleePy:StopForumSpam</id>
5 5
 	<name>Stop Forum Spam</name>
6
-	<version>1.5.1</version>
6
+	<version>1.5.2</version>
7 7
 	<type>modification</type>
8 8
 
9 9
 	<!-- 2.0 has no support for hooks -->
... ...
@@ -76,7 +76,7 @@
76 76
 			<hook hook="integrate_manage_registrations" function="SFSA::hook_manage_registrations" />
77 77
 
78 78
 			<!-- Profile Section -->
79
-			<hook hook="integrate_pre_profile_areas" function="SFS::hook_pre_profile_areas" />
79
+			<hook hook="integrate_pre_profile_areas" function="SFSP::hook_pre_profile_areas" file="$sourcedir/StopForumSpam/SFS-Profile.php" />
80 80
 
81 81
 			<!-- Display Section -->
82 82
 			<hook hook="integrate_prepare_display_context" function="SFS::hook_prepare_display_context" />
... ...
@@ -97,14 +97,14 @@
97 97
 			<hook hook="integrate_create_control_verification_test" function="SFS::hook_create_control_verification_test" reverse="true" />
98 98
 
99 99
 			<!-- Admin Section -->
100
-			<hook hook="integrate_admin_include" function="$sourcedir/SFS-Subs-Admin.php" reverse="true" />
100
+			<hook hook="integrate_admin_include" function="$sourcedir/StopForumSpam/SFS-Admin.php" reverse="true" />
101 101
 			<hook hook="integrate_admin_areas" function="SFSA::hook_admin_areas" reverse="true" />
102 102
 			<hook hook="integrate_modify_modifications" function="SFSA::hook_modify_modifications" reverse="true" />
103
-			<hook hook="integrate_manage_logs" function="SFSL::hook_manage_logs" reverse="true" file="$sourcedir/SFS-Subs-Logs.php" />
103
+			<hook hook="integrate_manage_logs" function="SFSL::hook_manage_logs" file="$sourcedir/StopForumSpam/SFS-Logs.php" reverse="true" />
104 104
 			<hook hook="integrate_manage_registrations" function="SFSA::hook_manage_registrations" reverse="true" />
105 105
 
106 106
 			<!-- Profile Section -->
107
-			<hook hook="integrate_pre_profile_areas" function="SFS::hook_pre_profile_areas" reverse="true" />
107
+			<hook hook="integrate_pre_profile_areas" function="SFSP::hook_pre_profile_areas" file="$sourcedir/StopForumSpam/SFS-Profile.php" reverse="true" />
108 108
 
109 109
 			<!-- Display Section -->
110 110
 			<hook hook="integrate_prepare_display_context" function="SFS::hook_prepare_display_context" reverse="true" />
... ...
@@ -121,7 +121,7 @@
121 121
 		<remove-file name="$themedir/images/admin/sfs.webp" />
122 122
 	</uninstall>
123 123
 
124
-	<upgrade from="1.0-1.5" for="2.1.*">
124
+	<upgrade from="1.0-1.5.1" for="2.1.*">
125 125
 		<require-file name="language/StopForumSpam.english.php" destination="$themes_dir/default/languages" />
126 126
         <require-file name="language/StopForumSpam.finnish.php" destination="$themes_dir/default/languages" />
127 127
 
... ...
@@ -143,7 +143,9 @@
143 143
 		<hook hook="integrate_manage_logs" function="SFSA::hook_manage_logs" reverse="true" error="ignore" />
144 144
 		<hook hook="integrate_manage_logs" function="SFSL::hook_manage_logs" file="$sourcedir/StopForumSpam/SFS-Logs.php" />
145 145
 
146
-		<hook hook="integrate_pre_profile_areas" function="SFS::hook_pre_profile_areas" />
146
+		<hook hook="integrate_pre_profile_areas" function="SFSP::hook_pre_profile_areas" file="$sourcedir/StopForumSpam/SFS-Profile.php" />
147
+		<hook hook="integrate_pre_profile_areas" function="SFS::hook_pre_profile_areas" reverse="true" />
148
+
147 149
 		<hook hook="integrate_prepare_display_context" function="SFS::hook_prepare_display_context" />
148 150
 		<hook hook="integrate_mod_buttons" function="SFS::hook_mod_buttons" />
149 151
 
... ...
@@ -152,7 +154,7 @@
152 154
 		<require-file name="sfs.webp" destination="$themedir/images/admin" />
153 155
 	</upgrade>
154 156
 
155
-	<upgrade from="1.0-1.5" for="2.0.*">
157
+	<upgrade from="1.0-1.4" for="2.0.*">
156 158
 		<code type="file">sfs_hooks_install.php</code>
157 159
 
158 160
 		<require-file name="language/StopForumSpam.english.php" destination="$themes_dir/default/languages" />
159 161