X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Floader%2Fload-extension.php;h=3922ef4d2d018dbe93408a836ea65b9847900d53;hp=aad9cd0ab782e5fac67a1cd14bf99c64592449d4;hb=f4d7dc336fde4cebc47701026a94d193f77854a1;hpb=8e1b16ef11efcfd85b52c61f8886bc44e3caa98e

diff --git a/inc/loader/load-extension.php b/inc/loader/load-extension.php
index aad9cd0ab7..3922ef4d2d 100644
--- a/inc/loader/load-extension.php
+++ b/inc/loader/load-extension.php
@@ -61,7 +61,9 @@ if (($GLOBALS['cache_instance']->loadCacheFile('extension')) && ($GLOBALS['cache
 		// Loop through all
 		foreach ($EXT_DUMMY['ext_name'] as $k => $ext_name) {
 			// Load CSS file
-			if ($EXT_DUMMY['ext_css'][$k] == 'Y') addExtensionCssFile($ext_name . '.css');
+			if ($EXT_DUMMY['ext_css'][$k] == 'Y') {
+				addExtensionCssFile($ext_name . '.css');
+			} // END - if
 
 			// Load extension file itself
 			if (($EXT_DUMMY['ext_active'][$k] == 'Y') || ($EXT_DUMMY['ext_keep'][$k] == 'Y')) {
@@ -136,34 +138,24 @@ if (($GLOBALS['cache_instance']->loadCacheFile('extension')) && ($GLOBALS['cache
 
 	// Add more if sql_patches is recent enougth
 	$add = '';
-	if (isExtensionInstalledAndNewer('sql_patches', '0.0.6')) $add = ", `ext_has_css` AS ext_css";
+	if (isExtensionInstalledAndNewer('sql_patches', '0.0.6')) {
+		$add = ', `ext_has_css` AS `ext_css`';
+	} // END - if 
 
 	// Load all modules and their data
-	$result = SQL_QUERY('SELECT `id` AS ext_id, `ext_name`, `ext_active`, `ext_version`'.$add.' FROM `{?_MYSQL_PREFIX?}_extensions` ORDER BY `ext_name` ASC', __FILE__, __LINE__);
+	$result = SQL_QUERY('SELECT `id` AS `ext_id`, `ext_name`, `ext_active`, `ext_version`' . $add . ' FROM `{?_MYSQL_PREFIX?}_extensions` ORDER BY `ext_name` ASC', __FILE__, __LINE__);
 	while ($content = SQL_FETCHARRAY($result)) {
 		// Load extension
 		loadExtension($content['ext_name'], 'test');
 
 		// Get menu entry
-		$content['ext_menu'] = 'N';
-		if (ifModuleHasMenu($content['ext_name'], true)) {
-			// Extension is a module and has menu... pew!
-			$content['ext_menu'] = 'Y';
-		} // END - if
+		$content['ext_menu'] = convertBooleanToYesNo(ifModuleHasMenu($content['ext_name'], true));
 
 		// Get language entry
-		$content['ext_lang'] = 'N';
-		if (isLanguageIncludeReadable($content['ext_name'])) {
-			// Readable
-			$content['ext_lang'] = 'Y';
-		} // END - if
+		$content['ext_lang'] = convertBooleanToYesNo(isLanguageIncludeReadable($content['ext_name']));
 
 		// Get function entry
-		$content['ext_func'] = 'N';
-		if (isExtensionFunctionFileReadable($content['ext_name'])) {
-			// Readable
-			$content['ext_func'] = 'Y';
-		} // END - if
+		$content['ext_func'] = convertBooleanToYesNo(isExtensionFunctionFileReadable($content['ext_name']));
 
 		// Transfer EXT_ALWAYS_ACTIVE flag
 		$content['ext_keep'] = getThisExtensionAlwaysActive();