fix for issue #229

BlackCatDevelopment · Mar 27, 2014 · eb8c60d · eb8c60d
1 parent c87aa19
commit eb8c60d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/upload/backend/pages/ajax_page_settings.php b/upload/backend/pages/ajax_page_settings.php
@@ -153,10 +153,10 @@
 	'language'					=> $results_array['language'],
 	'level'						=> $results_array['level'],
 	'menu'						=> $results_array['menu'],
-	'menu_title'				=> $results_array['menu_title'],
+	'menu_title'				=> htmlspecialchars_decode($results_array['menu_title'],ENT_QUOTES),
 	'modified_when'				=> ($results_array['modified_when'] != 0) ? CAT_Helper_DateTime::getDate($results_array['modified_when']) : 'Unknown',
 	'page_id'					=> $results_array['page_id'],
-	'page_title'				=> $results_array['page_title'],
+	'page_title'				=> htmlspecialchars_decode($results_array['page_title'],ENT_QUOTES),
 	'parent'					=> $results_array['parent'],
 	'searching'					=> $results_array['searching'] == 0 ? false : true,
 	'short_link'				=> substr( $results_array['link'], strripos( $results_array['link'], '/' ) + 1 ),

diff --git a/upload/backend/pages/ajax_settings_save.php b/upload/backend/pages/ajax_settings_save.php
@@ -274,8 +274,8 @@
 {
 	$ajax	= array(
 		'message'		=> $backend->lang()->translate('Page settings saved successfully'),
-		'menu_title'	=> $options['menu_title'],
-		'page_title'	=> $options['page_title'],
+		'menu_title'	=> htmlspecialchars_decode($options['menu_title'],ENT_QUOTES),
+		'page_title'	=> htmlspecialchars_decode($options['page_title'],ENT_QUOTES),
 		'visibility'	=> $options['visibility'],
 		'parent'		=> $options['parent'],
 		'position'		=> $options['position'],

diff --git a/upload/backend/pages/functions.php b/upload/backend/pages/functions.php
@@ -75,16 +75,16 @@ function backend_pages_getoptions()
     global $val, $users;
     $options = array(
         'admin_groups'   => ( ($val->sanitizePost('admin_groups',NULL,true) != '') ? $val->sanitizePost('admin_groups',NULL,true) : array('1') ),
-        'description'    => htmlspecialchars($val->sanitizePost('description',NULL,true)),
-        'keywords'       => htmlspecialchars($val->sanitizePost('keywords',NULL,true)),
+        'description'    => htmlspecialchars($val->sanitizePost('description',NULL,true), ENT_QUOTES, "UTF-8", false),
+        'keywords'       => htmlspecialchars($val->sanitizePost('keywords',NULL,true), ENT_QUOTES, "UTF-8", false),
         'language'       => $val->sanitizePost('language',NULL,true),
         'level'          => 0, // just a default here
         'link'           => '/'.( ( $val->sanitizePost('page_link',NULL,true) != '' ) ? htmlspecialchars($val->sanitizePost('page_link',NULL,true)) : '' ),
         'menu'           => ( ( $val->sanitizePost('menu',NULL,true) != '') ? $val->sanitizePost('menu',NULL,true) : 1 ),
-        'menu_title'     => htmlspecialchars($val->sanitizePost('menu_title',NULL,true) ),
+        'menu_title'     => htmlspecialchars($val->sanitizePost('menu_title',NULL,true), ENT_QUOTES, "UTF-8", false ),
         'modified_by'    => $users->get_user_id(),
         'modified_when'  => time(),
-        'page_title'     => htmlspecialchars($val->sanitizePost('page_title',NULL,true)),
+        'page_title'     => htmlspecialchars($val->sanitizePost('page_title',NULL,true), ENT_QUOTES, "UTF-8", false),
         'parent'         => ( $val->sanitizePost('parent','numeric',true) ? $val->sanitizePost('parent','numeric',true) : 0 ),
         'position'       => 1, // just a default here
         'searching'      => $val->sanitizePost('searching',NULL,true) ? '1' : '0',