Version 4.1.19.4
This commit is contained in:
1 parent
2bd5025018
commit
0dc2aee5ed
312 files changed
+53730
-32118
No files matched your search
@@ -1173,7 +1173,7 @@ class _Upgrade
|
||||
|
||||
foreach( $_SESSION['pfields'] as $k => $v )
|
||||
{
|
||||
$options = explode( '|', $v );
|
||||
$options = explode( '|', $v['content'] );
|
||||
$realOptions = array();
|
||||
|
||||
foreach( $options as $_index => $option )
|
||||
@@ -1194,7 +1194,12 @@ class _Upgrade
|
||||
{
|
||||
if( $_option AND isset( $realOptions[ $_option ] ) )
|
||||
{
|
||||
$_values[] = $realOptions[ $_option ][1];
|
||||
$key = 0;
|
||||
if ( $v['use_keys'] )
|
||||
{
|
||||
$key = 1;
|
||||
}
|
||||
$_values[] = $realOptions[ $_option ][$key];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1202,7 +1207,12 @@ class _Upgrade
|
||||
}
|
||||
else
|
||||
{
|
||||
$update['field_' . $k ] = ( isset( $realOptions[ $row['field_' . $k ] ] ) ) ? $realOptions[ $row['field_' . $k ] ][1] : NULL;
|
||||
$key = 0;
|
||||
if ( $v['use_keys'] )
|
||||
{
|
||||
$key = 1;
|
||||
}
|
||||
$update['field_' . $k ] = ( isset( $realOptions[ $row['field_' . $k ] ] ) ) ? $realOptions[ $row['field_' . $k ] ][$key] : NULL;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1309,7 +1319,7 @@ class _Upgrade
|
||||
$_SESSION['pfields'] = array();
|
||||
}
|
||||
|
||||
$_SESSION['pfields'][ $field['pf_id'] ] = $field['pf_content'];
|
||||
$_SESSION['pfields'][ $field['pf_id'] ] = array( 'content' => $field['pf_content'], 'use_keys' => ( $update['pf_type'] == 'CheckboxSet' ) ? TRUE : FALSE );
|
||||
$extra[ $field['pf_id'] ] = $field['pf_id'];
|
||||
$update['pf_content'] = json_encode( $newOptions );
|
||||
}
|
||||
@@ -3373,6 +3383,7 @@ DROP INDEX like_lookup_area"
|
||||
|
||||
/* Clear out any existing module records */
|
||||
\IPS\Db::i()->delete( 'core_modules' );
|
||||
\IPS\Db::i()->delete( 'core_permission_index', array( 'perm_type=?', 'module' ) );
|
||||
|
||||
/* Remove members app */
|
||||
\IPS\Db::i()->delete( 'core_applications', array( 'app_directory=?', 'members' ) );
|
||||
|
||||
Reference in new issue
Block a user