Admin - Simplify instantiation of Registry (#12270)

joomla · Oct 3, 2016 · f8812d5 · f8812d5
1 parent d8696de
commit f8812d5
Show file tree

Hide file tree

Showing 26 changed files with 44 additions and 88 deletions.
diff --git a/administrator/components/com_admin/postinstall/eaccelerator.php b/administrator/components/com_admin/postinstall/eaccelerator.php
@@ -46,8 +46,7 @@ function admin_postinstall_eaccelerator_action()
 	$prev = ArrayHelper::fromObject(new JConfig);
 	$data = array_merge($prev, array('cacheHandler' => 'file'));
 
-	$config = new Registry('config');
-	$config->loadArray($data);
+	$config = new Registry($data);
 
 	jimport('joomla.filesystem.path');
 	jimport('joomla.filesystem.file');

diff --git a/administrator/components/com_banners/tables/banner.php b/administrator/components/com_banners/tables/banner.php
@@ -129,8 +129,7 @@ public function bind($array, $ignore = array())
 	{
 		if (isset($array['params']) && is_array($array['params']))
 		{
-			$registry = new Registry;
-			$registry->loadArray($array['params']);
+			$registry = new Registry($array['params']);
 
 			if ((int) $registry->get('width', 0) < 0)
 			{

diff --git a/administrator/components/com_categories/controllers/category.php b/administrator/components/com_categories/controllers/category.php
@@ -177,15 +177,13 @@ protected function postSaveHook(JModelLegacy $model, $validData = array())
 
 		if (isset($item->params) && is_array($item->params))
 		{
-			$registry = new Registry;
-			$registry->loadArray($item->params);
+			$registry = new Registry($item->params);
 			$item->params = (string) $registry;
 		}
 
 		if (isset($item->metadata) && is_array($item->metadata))
 		{
-			$registry = new Registry;
-			$registry->loadArray($item->metadata);
+			$registry = new Registry($item->metadata);
 			$item->metadata = (string) $registry;
 		}
 	}

diff --git a/administrator/components/com_categories/models/category.php b/administrator/components/com_categories/models/category.php
@@ -179,8 +179,7 @@ public function getItem($pk = null)
 			}
 
 			// Convert the metadata field to an array.
-			$registry = new Registry;
-			$registry->loadString($result->metadata);
+			$registry = new Registry($result->metadata);
 			$result->metadata = $registry->toArray();
 
 			// Convert the created and modified dates to local user time for display in the form.

diff --git a/administrator/components/com_config/model/application.php b/administrator/components/com_config/model/application.php
@@ -202,8 +202,7 @@ public function save($data)
 		// Save the text filters
 		if (isset($data['filters']))
 		{
-			$registry = new Registry;
-			$registry->loadArray(array('filters' => $data['filters']));
+			$registry = new Registry(array('filters' => $data['filters']));
 
 			$extension = JTable::getInstance('extension');
 
@@ -297,8 +296,7 @@ public function save($data)
 		}
 
 		// Create the new configuration object.
-		$config = new Registry('config');
-		$config->loadArray($data);
+		$config = new Registry($data);
 
 		// Overwrite the old FTP credentials with the new ones.
 		$temp = JFactory::getConfig();
@@ -334,9 +332,8 @@ public function removeroot()
 		$prev = ArrayHelper::fromObject($prev);
 
 		// Create the new configuration object, and unset the root_user property
-		$config = new Registry('config');
 		unset($prev['root_user']);
-		$config->loadArray($prev);
+		$config = new Registry($prev);
 
 		// Write the configuration file.
 		return $this->writeConfigFile($config);

diff --git a/administrator/components/com_config/view/application/tmpl/default.php b/administrator/components/com_config/view/application/tmpl/default.php
@@ -46,8 +46,7 @@
 				foreach ($this->submenumodules as $submenumodule)
 				{
 					$output = JModuleHelper::renderModule($submenumodule);
-					$params = new Registry;
-					$params->loadString($submenumodule->params);
+					$params = new Registry($submenumodule->params);
 					echo $output;
 				}
 				?>

diff --git a/administrator/components/com_contact/models/contact.php b/administrator/components/com_contact/models/contact.php
@@ -309,8 +309,7 @@ public function getItem($pk = null)
 		if ($item = parent::getItem($pk))
 		{
 			// Convert the metadata field to an array.
-			$registry = new Registry;
-			$registry->loadString($item->metadata);
+			$registry = new Registry($item->metadata);
 			$item->metadata = $registry->toArray();
 		}
 

diff --git a/administrator/components/com_contact/tables/contact.php b/administrator/components/com_contact/tables/contact.php
@@ -56,8 +56,7 @@ public function store($updateNulls = false)
 		// Transform the params field
 		if (is_array($this->params))
 		{
-			$registry = new Registry;
-			$registry->loadArray($this->params);
+			$registry = new Registry($this->params);
 			$this->params = (string) $registry;
 		}
 

diff --git a/administrator/components/com_content/models/article.php b/administrator/components/com_content/models/article.php
@@ -269,23 +269,19 @@ public function getItem($pk = null)
 		if ($item = parent::getItem($pk))
 		{
 			// Convert the params field to an array.
-			$registry = new Registry;
-			$registry->loadString($item->attribs);
+			$registry = new Registry($item->attribs);
 			$item->attribs = $registry->toArray();
 
 			// Convert the metadata field to an array.
-			$registry = new Registry;
-			$registry->loadString($item->metadata);
+			$registry = new Registry($item->metadata);
 			$item->metadata = $registry->toArray();
 
 			// Convert the images field to an array.
-			$registry = new Registry;
-			$registry->loadString($item->images);
+			$registry = new Registry($item->images);
 			$item->images = $registry->toArray();
 
 			// Convert the urls field to an array.
-			$registry = new Registry;
-			$registry->loadString($item->urls);
+			$registry = new Registry($item->urls);
 			$item->urls = $registry->toArray();
 
 			$item->articletext = trim($item->fulltext) != '' ? $item->introtext . "<hr id=\"system-readmore\" />" . $item->fulltext : $item->introtext;
@@ -481,8 +477,7 @@ public function save($data)
 
 		if (isset($data['images']) && is_array($data['images']))
 		{
-			$registry = new Registry;
-			$registry->loadArray($data['images']);
+			$registry = new Registry($data['images']);
 
 			$data['images'] = (string) $registry;
 		}
@@ -533,8 +528,7 @@ public function save($data)
 
 			unset($check);
 
-			$registry = new Registry;
-			$registry->loadArray($data['urls']);
+			$registry = new Registry($data['urls']);
 
 			$data['urls'] = (string) $registry;
 		}

diff --git a/administrator/components/com_cpanel/views/cpanel/tmpl/default.php b/administrator/components/com_cpanel/views/cpanel/tmpl/default.php
@@ -56,8 +56,7 @@
 			foreach ($this->modules as $module)
 			{
 				// Get module parameters
-				$params = new Registry;
-				$params->loadString($module->params);
+				$params = new Registry($module->params);
 				$bootstrapSize = $params->get('bootstrap_size');
 				if (!$bootstrapSize)
 				{

diff --git a/administrator/components/com_finder/helpers/indexer/helper.php b/administrator/components/com_finder/helpers/indexer/helper.php
@@ -471,8 +471,7 @@ public static function prepareContent($text, $params = null)
 		// Instantiate the parameter object if necessary.
 		if (!($params instanceof Registry))
 		{
-			$registry = new Registry;
-			$registry->loadString($params);
+			$registry = new Registry($params);
 			$params = $registry;
 		}
 

diff --git a/administrator/components/com_finder/helpers/indexer/query.php b/administrator/components/com_finder/helpers/indexer/query.php
@@ -507,8 +507,7 @@ protected function processStaticTaxonomy($filterId)
 		$this->filter = (int) $filterId;
 
 		// Get a parameter object for the filter date options.
-		$registry = new Registry;
-		$registry->loadString($return->params);
+		$registry = new Registry($return->params);
 		$params = $registry;
 
 		// Set the dates if not already set.

diff --git a/administrator/components/com_finder/tables/filter.php b/administrator/components/com_finder/tables/filter.php
@@ -48,8 +48,7 @@ public function bind($array, $ignore = '')
 	{
 		if (isset($array['params']) && is_array($array['params']))
 		{
-			$registry = new Registry;
-			$registry->loadArray($array['params']);
+			$registry = new Registry($array['params']);
 			$array['params'] = (string) $registry;
 		}
 

diff --git a/administrator/components/com_languages/models/override.php b/administrator/components/com_languages/models/override.php
@@ -180,8 +180,7 @@ public function save($data, $opposite_client = false)
 		}
 
 		// Write override.ini file with the strings.
-		$registry = new Registry;
-		$registry->loadObject($strings);
+		$registry = new Registry($strings);
 		$reg = $registry->toString('INI');
 
 		if (!JFile::write($filename, $reg))

diff --git a/administrator/components/com_languages/models/overrides.php b/administrator/components/com_languages/models/overrides.php
@@ -271,8 +271,7 @@ public function delete($cids)
 		}
 
 		// Write override.ini file with the left strings.
-		$registry = new Registry;
-		$registry->loadObject($strings);
+		$registry = new Registry($strings);
 		$reg = $registry->toString('INI');
 
 		$filename = constant('JPATH_' . $client) . '/language/overrides/' . $this->getState('filter.language') . '.override.ini';

diff --git a/administrator/components/com_menus/models/item.php b/administrator/components/com_menus/models/item.php
@@ -730,8 +730,7 @@ public function getItem($pk = null)
 		$result = ArrayHelper::toObject($properties);
 
 		// Convert the params field to an array.
-		$registry = new Registry;
-		$registry->loadString($table->params);
+		$registry = new Registry($table->params);
 		$result->params = $registry->toArray();
 
 		// Merge the request arguments in to the params for a component.
@@ -1237,8 +1236,7 @@ public function rebuild()
 
 		foreach ($items as &$item)
 		{
-			$registry = new Registry;
-			$registry->loadString($item->params);
+			$registry = new Registry($item->params);
 			$params = (string) $registry;
 
 			$query->clear();

diff --git a/administrator/components/com_menus/models/menu.php b/administrator/components/com_menus/models/menu.php
@@ -323,8 +323,7 @@ public function &getModules()
 
 		foreach ($modules as &$module)
 		{
-			$params = new Registry;
-			$params->loadString($module->params);
+			$params = new Registry($module->params);
 
 			$menuType = $params->get('menutype');
 

diff --git a/administrator/components/com_modules/models/module.php b/administrator/components/com_modules/models/module.php
@@ -698,8 +698,7 @@ public function getItem($pk = null)
 			$this->_cache[$pk] = ArrayHelper::toObject($properties, 'JObject');
 
 			// Convert the params field to an array.
-			$registry = new Registry;
-			$registry->loadString($table->params);
+			$registry = new Registry($table->params);
 			$this->_cache[$pk]->params = $registry->toArray();
 
 			// Determine the page assignment mode.

diff --git a/administrator/components/com_newsfeeds/models/newsfeed.php b/administrator/components/com_newsfeeds/models/newsfeed.php
@@ -367,13 +367,11 @@ public function getItem($pk = null)
 		if ($item = parent::getItem($pk))
 		{
 			// Convert the params field to an array.
-			$registry = new Registry;
-			$registry->loadString($item->metadata);
+			$registry = new Registry($item->metadata);
 			$item->metadata = $registry->toArray();
 
 			// Convert the images field to an array.
-			$registry = new Registry;
-			$registry->loadString($item->images);
+			$registry = new Registry($item->images);
 			$item->images = $registry->toArray();
 		}
 

diff --git a/administrator/components/com_plugins/models/plugin.php b/administrator/components/com_plugins/models/plugin.php
@@ -167,8 +167,7 @@ public function getItem($pk = null)
 			$this->_cache[$pk] = ArrayHelper::toObject($properties, 'JObject');
 
 			// Convert the params field to an array.
-			$registry = new Registry;
-			$registry->loadString($table->params);
+			$registry = new Registry($table->params);
 			$this->_cache[$pk]->params = $registry->toArray();
 
 			// Get the plugin XML.

diff --git a/administrator/components/com_tags/models/tag.php b/administrator/components/com_tags/models/tag.php
@@ -128,18 +128,15 @@ public function getItem($pk = null)
 			}
 
 			// Convert the metadata field to an array.
-			$registry = new Registry;
-			$registry->loadString($result->metadata);
+			$registry = new Registry($result->metadata);
 			$result->metadata = $registry->toArray();
 
 			// Convert the images field to an array.
-			$registry = new Registry;
-			$registry->loadString($result->images);
+			$registry = new Registry($result->images);
 			$result->images = $registry->toArray();
 
 			// Convert the urls field to an array.
-			$registry = new Registry;
-			$registry->loadString($result->urls);
+			$registry = new Registry($result->urls);
 			$result->urls = $registry->toArray();
 
 			// Convert the created and modified dates to local user time for display in the form.
@@ -287,15 +284,13 @@ public function save($data)
 
 		if (isset($data['images']) && is_array($data['images']))
 		{
-			$registry = new Registry;
-			$registry->loadArray($data['images']);
+			$registry = new Registry($data['images']);
 			$data['images'] = (string) $registry;
 		}
 
 		if (isset($data['urls']) && is_array($data['urls']))
 		{
-			$registry = new Registry;
-			$registry->loadArray($data['urls']);
+			$registry = new Registry($data['urls']);
 			$data['urls'] = (string) $registry;
 		}
 

diff --git a/administrator/components/com_tags/tables/tag.php b/administrator/components/com_tags/tables/tag.php
@@ -47,29 +47,25 @@ public function bind($array, $ignore = '')
 	{
 		if (isset($array['params']) && is_array($array['params']))
 		{
-			$registry = new Registry;
-			$registry->loadArray($array['params']);
+			$registry = new Registry($array['params']);
 			$array['params'] = (string) $registry;
 		}
 
 		if (isset($array['metadata']) && is_array($array['metadata']))
 		{
-			$registry = new Registry;
-			$registry->loadArray($array['metadata']);
+			$registry = new Registry($array['metadata']);
 			$array['metadata'] = (string) $registry;
 		}
 
 		if (isset($array['urls']) && is_array($array['urls']))
 		{
-			$registry = new Registry;
-			$registry->loadArray($array['urls']);
+			$registry = new Registry($array['urls']);
 			$array['urls'] = (string) $registry;
 		}
 
 		if (isset($array['images']) && is_array($array['images']))
 		{
-			$registry = new Registry;
-			$registry->loadArray($array['images']);
+			$registry = new Registry($array['images']);
 			$array['images'] = (string) $registry;
 		}
 

diff --git a/administrator/components/com_templates/models/style.php b/administrator/components/com_templates/models/style.php
@@ -354,8 +354,7 @@ public function getItem($pk = null)
 			$this->_cache[$pk] = ArrayHelper::toObject($properties, 'JObject');
 
 			// Convert the params field to an array.
-			$registry = new Registry;
-			$registry->loadString($table->params);
+			$registry = new Registry($table->params);
 			$this->_cache[$pk]->params = $registry->toArray();
 
 			// Get the template XML.

diff --git a/administrator/components/com_templates/tables/style.php b/administrator/components/com_templates/tables/style.php
@@ -44,8 +44,7 @@ public function bind($array, $ignore = '')
 	{
 		if (isset($array['params']) && is_array($array['params']))
 		{
-			$registry = new Registry;
-			$registry->loadArray($array['params']);
+			$registry = new Registry($array['params']);
 			$array['params'] = (string) $registry;
 		}
 

diff --git a/administrator/components/com_users/views/notes/view.html.php b/administrator/components/com_users/views/notes/view.html.php
@@ -83,8 +83,7 @@ public function display($tpl = null)
 		// Turn parameters into registry objects
 		foreach ($this->items as $item)
 		{
-			$item->cparams = new Registry;
-			$item->cparams->loadString($item->category_params);
+			$item->cparams = new Registry($item->category_params);
 		}
 
 		$this->addToolbar();