From 627d18ede199339ad3a5bc8b85c0cc71616a6868 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 2 Mar 2017 16:00:32 +0100
Subject: [inc/Hook] New helper for loading hooks

---
 modules-available/main/page.inc.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'modules-available/main/page.inc.php')

diff --git a/modules-available/main/page.inc.php b/modules-available/main/page.inc.php
index bd50a5d1..08e8b5a6 100644
--- a/modules-available/main/page.inc.php
+++ b/modules-available/main/page.inc.php
@@ -24,11 +24,8 @@ class Page_Main extends Page
 
 		// Warnings
 		$needSetup = false;
-		foreach (glob('modules/*/hooks/main-warning.inc.php') as $file) {
-			preg_match('#^modules/([^/]+)/#', $file, $out);
-			if (!Module::isAvailable($out[1]))
-				continue;
-			include $file;
+		foreach (Hook::load('main-warning') as $hook) {
+			include $hook->file;
 		}
 
 		// Update warning state
-- 
cgit v1.2.3-55-g7522