Index: branches/RC/core/install/install_schema.sql
===================================================================
diff -u -r8929 -r9071
--- branches/RC/core/install/install_schema.sql (.../install_schema.sql) (revision 8929)
+++ branches/RC/core/install/install_schema.sql (.../install_schema.sql) (revision 9071)
@@ -187,8 +187,8 @@
PortalUserId int(11) NOT NULL auto_increment,
Login varchar(255) default NULL,
`Password` VARCHAR(255) NULL DEFAULT 'd41d8cd98f00b204e9800998ecf8427e',
- FirstName varchar(255) default NULL,
- LastName varchar(255) default NULL,
+ FirstName VARCHAR(255) NOT NULL DEFAULT '',
+ LastName VARCHAR(255) NOT NULL DEFAULT '',
Company varchar(255) NOT NULL default '',
Email varchar(255) NOT NULL default '',
CreatedOn INT DEFAULT NULL,
Index: branches/RC/core/units/users/users_config.php
===================================================================
diff -u -r8929 -r9071
--- branches/RC/core/units/users/users_config.php (.../users_config.php) (revision 8929)
+++ branches/RC/core/units/users/users_config.php (.../users_config.php) (revision 9071)
@@ -143,8 +143,8 @@
'PortalUserId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
'Login' => Array('type' => 'string', 'unique'=>Array('Login'), 'default' => null,'required'=>1, 'error_msgs' => Array('unique'=>'!lu_user_already_exist!')),
'Password' => Array('type' => 'string', 'formatter' => 'kPasswordFormatter', 'encryption_method' => 'md5', 'verify_field' => 'VerifyPassword', 'skip_empty' => 1, 'default' => md5('') ),
- 'FirstName' => Array('type' => 'string','default' => null),
- 'LastName' => Array('type' => 'string','default' => null),
+ 'FirstName' => Array('type' => 'string', 'not_null' => 1, 'default' => ''),
+ 'LastName' => Array('type' => 'string', 'not_null' => 1, 'default' => ''),
'Company' => Array('type' => 'string','not_null' => '1','default' => ''),
'Email' => Array('type' => 'string', 'formatter'=>'kFormatter', 'regexp'=>'/^[_a-zA-Z0-9-\.]+@[a-zA-Z0-9-\.]+\.[a-z]{2,4}$/', 'sample_value' => 'email@domain.com', 'unique'=>Array('Email'), 'not_null' => '1', 'required'=>1, 'default' => '', 'error_msgs' => Array('invalid_format'=>'!la_invalid_email!', 'unique'=>'!lu_email_already_exist!') ),
'CreatedOn' => Array('type'=>'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
Index: branches/RC/core/install/upgrades.sql
===================================================================
diff -u -r9060 -r9071
--- branches/RC/core/install/upgrades.sql (.../upgrades.sql) (revision 9060)
+++ branches/RC/core/install/upgrades.sql (.../upgrades.sql) (revision 9071)
@@ -117,3 +117,7 @@
INSERT INTO ConfigurationValues VALUES (DEFAULT, 'CategoriesRebuildSerial', '0', 'In-Portal', '');
UPDATE ConfigurationAdmin SET `element_type` = 'textarea' WHERE `VariableName` IN ('Category_MetaKey', 'Category_MetaDesc');
+
+ALTER TABLE PortalUser
+ CHANGE FirstName FirstName VARCHAR(255) NOT NULL DEFAULT '',
+ CHANGE LastName LastName VARCHAR(255) NOT NULL DEFAULT '';
\ No newline at end of file
Index: branches/RC/core/units/users/users_tag_processor.php
===================================================================
diff -u -r9050 -r9071
--- branches/RC/core/units/users/users_tag_processor.php (.../users_tag_processor.php) (revision 9050)
+++ branches/RC/core/units/users/users_tag_processor.php (.../users_tag_processor.php) (revision 9071)
@@ -207,18 +207,17 @@
return $perm_helper->TagPermissionCheck($params);
}
-
/**
- * Returns link to user public profile
- *
- * @param Array $params
- * @return string
- */
+ * Returns link to user public profile
+ *
+ * @param Array $params
+ * @return string
+ */
function ProfileLink($params)
- {
+ {
$object =& $this->getObject($params);
$params['user_id'] = $object->GetID();
-
+
return $this->Application->ProcessParsedTag('m', 'Link', $params);
}
}
Index: branches/RC/themes/default2007/platform/my_account/public_profile.tpl
===================================================================
diff -u -r9067 -r9071
--- branches/RC/themes/default2007/platform/my_account/public_profile.tpl (.../public_profile.tpl) (revision 9067)
+++ branches/RC/themes/default2007/platform/my_account/public_profile.tpl (.../public_profile.tpl) (revision 9071)
@@ -57,12 +57,8 @@
-
-
">
-
-
|
Index: branches/RC/themes/default2007/phrases_edit.tpl
===================================================================
diff -u -r9058 -r9071
--- branches/RC/themes/default2007/phrases_edit.tpl (.../phrases_edit.tpl) (revision 9058)
+++ branches/RC/themes/default2007/phrases_edit.tpl (.../phrases_edit.tpl) (revision 9071)
@@ -30,14 +30,11 @@
-
-
-
" />
" value="" />
-
+ " value="0" />
"/>
Index: branches/RC/admin/install/upgrades/inportal_upgrade_v4.2.0.sql
===================================================================
diff -u -r9044 -r9071
--- branches/RC/admin/install/upgrades/inportal_upgrade_v4.2.0.sql (.../inportal_upgrade_v4.2.0.sql) (revision 9044)
+++ branches/RC/admin/install/upgrades/inportal_upgrade_v4.2.0.sql (.../inportal_upgrade_v4.2.0.sql) (revision 9071)
@@ -11,5 +11,7 @@
INSERT INTO ConfigurationValues VALUES (DEFAULT, 'UseToolbarLabels', '1', 'In-Portal', 'in-portal:configure_general');
INSERT INTO ConfigurationAdmin VALUES ('UseToolbarLabels', 'la_Text_Website', 'la_config_UseToolbarLabels', 'checkbox', NULL , NULL , 10.20, 0, 0);
+ALTER TABLE PortalUser CHANGE FirstName FirstName VARCHAR(255) NOT NULL DEFAULT '', CHANGE LastName LastName VARCHAR(255) NOT NULL DEFAULT '';
+
UPDATE Modules SET Version = '4.2.0' WHERE Name = 'Core';
UPDATE Modules SET Version = '4.2.0' WHERE Name = 'In-Portal';
\ No newline at end of file