Version 4.3.0

applications/nexus/extensions/core/EditorLocations/Admin.php

@@ -43,6 +43,10 @@ class _Admin
 	 */
 	public function canAttach( $member, $field )
 	{
+		if ( mb_substr( $field->options['autoSaveKey'], -6 ) == '-email' )
+		{
+			return FALSE;
+		}
 		return NULL;
 	}
 
@@ -64,6 +68,7 @@ class _Admin
 			{				
 				case 'pkg':
 				case 'pkg-assoc':
+				case 'pkg-email':
 					return \IPS\nexus\Package\Item::load( $id1 )->canView( $member );
 					
 				case 'pkg-pg':
@@ -123,6 +128,7 @@ class _Admin
 			case 'pkg':
 			case 'pkg-assoc':
 			case 'pkg-pg':
+			case 'pkg-email':
 				return \IPS\Http\Url::internal( "app=nexus&module=store&controller=packages&subnode=1&do=form&id={$id1}", 'admin' );
 				
 			case 'pgroup':
@@ -257,8 +263,7 @@ class _Admin
 	
 				if( $newMessage !== FALSE )
 				{
-					\IPS\Db::i()->update( 'core_sys_conf_settings', array( 'conf_value' => $newMessage ), array( "conf_key=?", $k ) );
-					unset( \IPS\Data\Store::i()->settings );
+					\IPS\Settings::i()->changeValues( array( $k => $newMessage ) );
 				}
 			}
 		}
@@ -279,7 +284,7 @@ class _Admin
 				}
 				else
 				{
-					$rebuilt = call_user_func( $callback, $package['p_page'] );
+					$rebuilt = call_user_func( $callback, $package['p_page'], NULL, FALSE, 'nexus_Admin', $package['p_id'], NULL, 'pkg-pg' );
 				}
 			}
 			catch( \InvalidArgumentException $e )

applications/nexus/extensions/core/EditorLocations/Customer.php

@@ -87,7 +87,7 @@ class _Customer
 		}
 		else
 		{
-			return \IPS\Http\Url::internal( 'app=nexus&module=clients&controller=info', 'front', 'clientsinfo', array(), \IPS\Settings::i()->nexus_https );
+			return \IPS\Http\Url::internal( 'app=nexus&module=clients&controller=info', 'front', 'clientsinfo' );
 		}
 	}