mbirth/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

(backport)

Browse Source 
Fix a situation where globally stored template variables do not get preference over local (old) ones
	docs/NEWS
This commit is contained in:
Garvin Hicking
2011-11-03 17:02:45 +01:00
parent abed371df2
commit e8cacdcfdd
2 changed files with 8 additions and 1 deletions
docs
NEWS
include/admin
templates.inc.php

5
docs/NEWS

@ -13,7 +13,10 @@ Version 1.6.1 ()
* Fixed unneccessary preg_match notices in the statistics backend * Fixed unneccessary preg_match notices in the statistics backend
Version 1.6 (October 27th, 2011) * Fixed a possible problem where template-specific variables would
note be cleared in favor of the new global ones.
Version 1.6 (October 27th 2011)
------------------------------------------------------------------------ ------------------------------------------------------------------------
* Fix XSS issue in mediadatabase and karma * Fix XSS issue in mediadatabase and karma

4
include/admin/templates.inc.php

@ -28,6 +28,10 @@ class template_option {
function set_config($item, $value) { function set_config($item, $value) {
global $serendipity; global $serendipity;
serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}options
WHERE okey = 't_" . serendipity_db_escape_string($serendipity['template']) . "'
AND name = '" . serendipity_db_escape_string($item) . "'");
if ($this->config[$item]['scope'] == 'global') { if ($this->config[$item]['scope'] == 'global') {
serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}options serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}options
WHERE okey = 't_global' WHERE okey = 't_global'