some more updates

joomla · Aug 12, 2021 · 33a0aed · 33a0aed
1 parent 9b4df26
commit 33a0aed
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/administrator/components/com_joomlaupdate/models/default.php b/administrator/components/com_joomlaupdate/models/default.php
@@ -1279,13 +1279,15 @@ public function getPhpSettings()
 		$setting = new stdClass;
 		$setting->label = JText::_('INSTL_DISPLAY_ERRORS');
 		$setting->state = (bool) ini_get('display_errors');
+		$setting->notice = null;
 		$setting->recommended = false;
 		$settings[] = $setting;
 
 		// Check for file uploads.
 		$setting = new stdClass;
 		$setting->label = JText::_('INSTL_FILE_UPLOADS');
 		$setting->state = (bool) ini_get('file_uploads');
+		$setting->notice = null;
 		$setting->recommended = true;
 		$settings[] = $setting;
 
@@ -1296,6 +1298,7 @@ public function getPhpSettings()
 			$setting = new stdClass;
 			$setting->label = JText::_('INSTL_MAGIC_QUOTES_RUNTIME');
 			$setting->state = (bool) ini_get('magic_quotes_runtime');
+			$setting->notice = null;
 			$setting->recommended = false;
 			$settings[] = $setting;
 
@@ -1311,20 +1314,23 @@ public function getPhpSettings()
 		$setting = new stdClass;
 		$setting->label = JText::_('INSTL_OUTPUT_BUFFERING');
 		$setting->state = (int) ini_get('output_buffering') !== 0;
+		$setting->notice = null;
 		$setting->recommended = false;
 		$settings[] = $setting;
 
 		// Check for session auto-start.
 		$setting = new stdClass;
 		$setting->label = JText::_('INSTL_SESSION_AUTO_START');
 		$setting->state = (bool) ini_get('session.auto_start');
+		$setting->notice = null;
 		$setting->recommended = false;
 		$settings[] = $setting;
 
 		// Check for native ZIP support.
 		$setting = new stdClass;
 		$setting->label = JText::_('INSTL_ZIP_SUPPORT_AVAILABLE');
 		$setting->state = function_exists('zip_open') && function_exists('zip_read');
+		$setting->notice = null;
 		$setting->recommended = true;
 		$settings[] = $setting;
 
@@ -1335,7 +1341,7 @@ public function getPhpSettings()
 			$setting = new stdClass;
 			$setting->label  = JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_CORE_FRONTEND_TEMPLATE_USED_TITLE');
 			$setting->state  = $this->isUsingCoreFrontendTemplate();
-			$setting->notice = $setting->state ? false : JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_CORE_FRONTEND_TEMPLATE_USED_NOTICE');
+			$setting->notice = $setting->state ? null : JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_CORE_FRONTEND_TEMPLATE_USED_NOTICE');
 			$setting->recommended = true;
 			$settings[] = $setting;
 		}

diff --git a/administrator/components/com_joomlaupdate/views/default/tmpl/default_preupdatecheck.php b/administrator/components/com_joomlaupdate/views/default/tmpl/default_preupdatecheck.php
@@ -152,7 +152,7 @@
 							<td>
 								<span class="label label-<?php echo ($setting->state === $setting->recommended) ? 'success' : 'warning'; ?>">
 									<?php echo JText::_($setting->state ? 'JON' : 'JOFF'); ?>
-									<?php if (isset($setting->notice)) : ?>
+									<?php if ($setting->notice) : ?>
 										<span class="icon-info icon-white hasTooltip" title="<?php echo $setting->notice; ?>"></span>
 									<?php endif; ?>
 								</span>

diff --git a/administrator/language/en-GB/en-GB.com_joomlaupdate.ini b/administrator/language/en-GB/en-GB.com_joomlaupdate.ini
@@ -3,10 +3,6 @@
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
-COM_JOOMLAUPDATE_VIEW_DEFAULT_NON_CORE_BACKEND_TEMPLATE_TITLE="Core Backend Template used"
-COM_JOOMLAUPDATE_VIEW_DEFAULT_NON_CORE_BACKEND_TEMPLATE_NOTICE="You are not using a core backend template. Please be aware that there are major changes between Joomla 3.10 and 4 for the backend template. Please switch to 'isis' for the time of the upgrade to be on the safe side."
-
-
 COM_JOOMLAUPDATE_CHECKED_UPDATES="Checked for updates."
 COM_JOOMLAUPDATE_CONFIGURATION="Joomla Update: Options"
 COM_JOOMLAUPDATE_CONFIG_CUSTOMURL_DESC="This is a custom XML update source URL, used only when the &quot;Update Source&quot; option is set to &quot;Custom URL&quot;."