Index: branches/5.2.x/core/kernel/db/cat_event_handler.php
===================================================================
--- branches/5.2.x/core/kernel/db/cat_event_handler.php
+++ branches/5.2.x/core/kernel/db/cat_event_handler.php
@@ -1800,7 +1800,7 @@
 		/* @var $value string */
 
 		$type = ucfirst(strtolower($type));
-		extract($search_data);
+		extract($search_data, EXTR_SKIP);
 
 		switch ($type) {
 			case 'Field':
Index: branches/5.2.x/core/kernel/nparser/ntags.php
===================================================================
--- branches/5.2.x/core/kernel/nparser/ntags.php
+++ branches/5.2.x/core/kernel/nparser/ntags.php
@@ -206,7 +206,7 @@
 
 		$code[] = "\$params = array_merge($defaults, \$params);";
 		$code[] = "if (!isset(\$params['PrefixSpecial']) && isset(\$params['prefix'])) {\$params['PrefixSpecial'] = \$params['prefix'];};";
-		$code[] = "extract(\$params);";
+		$code[] = 'extract($params, EXTR_SKIP);';
 		$code[] = "\$_parser->SetParams(\$params);";
 		$code[] = 'ob_start();';
 		$this->AppendCode($o, $code);
Index: branches/5.2.x/core/units/helpers/site_config_helper.php
===================================================================
--- branches/5.2.x/core/units/helpers/site_config_helper.php
+++ branches/5.2.x/core/units/helpers/site_config_helper.php
@@ -87,7 +87,7 @@
 		 */
 		function processConfigChanges($prefix, $changes)
 		{
-			extract($changes);
+			extract($changes, EXTR_SKIP);
 
 			$section_adjustments = $this->Application->getUnitOption('core-sections', 'SectionAdjustments', Array ());
 			$title_presets = $this->Application->getUnitOption($prefix, 'TitlePresets', Array ());
@@ -209,4 +209,4 @@
 
 			return $fields;
 		}
-	}
\ No newline at end of file
+	}