+ [#31349] Display Error Message when Magic Quotes is Enabled. Thanks

Brian Teeman
joomla · Jul 21, 2013 · 7169cd2 · 7169cd2
1 parent 3cdc3dc
commit 7169cd2
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/administrator/index.php b/administrator/index.php
@@ -43,6 +43,20 @@
 	array('language' => $app->getUserState('application.lang'))
 );
 
+// Test for magic quotes
+if (get_magic_quotes_gpc())
+{
+	$lang = JFactory::getLanguage();
+	if ($lang->hasKey('JERROR_MAGIC_QUOTES'))
+	{
+		JFactory::getApplication()->enqueueMessage(JText::_('JERROR_MAGIC_QUOTES'), 'Error');
+	}
+	else
+	{
+		JFactory::getApplication()->enqueueMessage('Your host needs to disable magic_quotes_gpc to run this version of Joomla!', 'Error');
+	}
+}
+
 // Mark afterIntialise in the profiler.
 JDEBUG ? $_PROFILER->mark('afterInitialise') : null;
 

diff --git a/administrator/language/en-GB/en-GB.ini b/administrator/language/en-GB/en-GB.ini
@@ -144,6 +144,7 @@ JERROR_INVALID_CONTROLLER_CLASS="Invalid controller class"
 JERROR_LOADFILE_FAILED="Error loading form file"
 JERROR_LOADING_MENUS="Error loading Menus: %s"
 JERROR_LOGIN_DENIED="You do not have access to the administrator section of this site."
+JERROR_MAGIC_QUOTES="Your host needs to disable magic_quotes_gpc to run this version of Joomla!"
 JERROR_NO_ITEMS_SELECTED="No item(s) selected."
 JERROR_NOLOGIN_BLOCKED="Login denied! Your account has either been blocked or you have not activated it yet."
 JERROR_SAVE_FAILED="Could not save data. Error: %s"

diff --git a/installation/CHANGELOG b/installation/CHANGELOG
@@ -27,6 +27,9 @@ $ -> Language fix or change
 
 ; Below is merged into v3.1.2
 
+21-Jul-2013 Jean-Marie Simonet
+ + [#31349] Display Error Message when Magic Quotes is Enabled. Thanks Brian Teeman
+
 20-Jul-2013 Jean-Marie Simonet
  # [#31496] DEBUG_BACKTRACE_IGNORE_ARGS not supported in PHP 5.3.1-5.3.5. Thanks Beat
  # [#31533] User Interface allows tags in Banner Categories but it should not. Thanks Elin waring