fixed: make sure custom link for widgets are always used

ColdTrick · Nov 26, 2020 · 8799fac · 8799fac
1 parent 14442cc
commit 8799fac
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/classes/ColdTrick/WidgetManager/Bootstrap.php b/classes/ColdTrick/WidgetManager/Bootstrap.php
@@ -17,7 +17,7 @@ public function init() {
 		elgg_register_plugin_hook_handler('prepare', 'menu:widget', '\ColdTrick\WidgetManager\Menus::prepareWidgetEditDeleteMenuItems');
 		elgg_register_plugin_hook_handler('permissions_check', 'widget_layout', '\ColdTrick\WidgetManager\Widgets::layoutPermissionsCheck');
 		elgg_register_plugin_hook_handler('handlers', 'widgets', '\ColdTrick\WidgetManager\Widgets::applyWidgetsConfig', 9999);
-		elgg_register_plugin_hook_handler('entity:url', 'object', '\ColdTrick\WidgetManager\Widgets::getWidgetURL');
+		elgg_register_plugin_hook_handler('entity:url', 'object', '\ColdTrick\WidgetManager\Widgets::getWidgetURL', 9999);
 		elgg_register_plugin_hook_handler('action:validate', 'widgets/add', '\ColdTrick\WidgetManager\Access::moreRightsForWidgetManager');
 		elgg_register_plugin_hook_handler('action:validate', 'widgets/move', '\ColdTrick\WidgetManager\Access::moreRightsForWidgetManager');
 		elgg_register_plugin_hook_handler('permissions_check', 'object', '\ColdTrick\WidgetManager\Access::canEditWidgetOnManagedLayout');

diff --git a/classes/ColdTrick/WidgetManager/Widgets.php b/classes/ColdTrick/WidgetManager/Widgets.php
@@ -268,16 +268,17 @@ public static function getWidgetURL(\Elgg\Hook $hook) {
 		if (!$widget instanceof \ElggWidget) {
 			return;
 		}
+
+		// custom urls always trump existing values
+		if ($widget->widget_manager_custom_url) {
+			return $widget->widget_manager_custom_url;
+		}
 
 		if (!empty($hook->getValue())) {
 			// already got a link
 			return;
 		}
 
-		if ($widget->widget_manager_custom_url) {
-			return $widget->widget_manager_custom_url;
-		}
-
 		if (elgg_in_context('default_widgets')) {
 			return;
 		}