Project

General

Profile

« Previous | Next » 

Revision c6c398c6

Added by Jim Pingle over 6 years ago

Fix #9121: Initialize arrays to prevent PHP 7 errors

View differences:

src/usr/local/www/pkg_edit.php
95 95
 *  https://redmine.pfsense.org/issues/7624
96 96
 *  https://redmine.pfsense.org/issues/476
97 97
 */
98
if ($config['installedpackages'] &&
99
    (count($config['installedpackages'][xml_safe_fieldname($pkg['name'])]['config']) > 0) &&
98

  
99
init_config_arr(array('installedpackages', xml_safe_fieldname($pkg['name']), 'config'));
100
if ((count($config['installedpackages'][xml_safe_fieldname($pkg['name'])]['config']) > 0) &&
100 101
    (empty($config['installedpackages'][xml_safe_fieldname($pkg['name'])]['config'][0])) &&
101 102
    is_array($config['installedpackages'][xml_safe_fieldname($pkg['name'])]['config'])) {
102 103
	array_shift($config['installedpackages'][xml_safe_fieldname($pkg['name'])]['config']);
......
1102 1103
			$size = ($pkga['size'] ? "size=\"{$pkga['size']}\"" : '');
1103 1104
			$fieldname = $pkga['fieldname'];
1104 1105

  
1105
			if (!is_array($config['aliases'])) {
1106
				$config['aliases'] = array();
1107
			}
1108
			
1106
			init_config_arr(array('aliases', 'alias'));
1109 1107
			$a_aliases = &$config['aliases']['alias'];
1110 1108
			$addrisfirst = 0;
1111 1109
			$aliasesaddr = "";

Also available in: Unified diff