Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

This commit is contained in:
Brion Vibber 2011-03-16 16:42:12 -07:00
commit e36959d451
7 changed files with 28 additions and 20 deletions

View File

@ -32,12 +32,14 @@ class ExtendedProfilePlugin extends Plugin
function onPluginVersion(&$versions)
{
$versions[] = array('name' => 'ExtendedProfile',
'version' => STATUSNET_VERSION,
'author' => 'Brion Vibber, Zach Copley',
'homepage' => 'http://status.net/wiki/Plugin:ExtendedProfile',
'rawdescription' =>
_m('UI extensions for additional profile fields.'));
$versions[] = array(
'name' => 'ExtendedProfile',
'version' => STATUSNET_VERSION,
'author' => 'Brion Vibber, Samantha Doherty, Zach Copley',
'homepage' => 'http://status.net/wiki/Plugin:ExtendedProfile',
'rawdescription' => _m(
'UI extensions for additional profile fields.')
);
return true;
}
@ -53,22 +55,26 @@ class ExtendedProfilePlugin extends Plugin
*/
function onAutoload($cls)
{
$lower = strtolower($cls);
$dir = dirname(__FILE__);
switch ($lower)
switch (strtolower($cls))
{
case 'extendedprofile':
case 'extendedprofilewidget':
case 'profiledetailaction':
case 'profiledetailsettingsaction':
require_once dirname(__FILE__) . '/' . $lower . '.php';
return false;
case 'userautocompleteaction':
require_once dirname(__FILE__) . '/action/' . mb_substr($lower, 0, -6) . '.php';
include_once $dir . '/actions/'
. strtolower(mb_substr($cls, 0, -6)) . '.php';
return false;
break; // Safety first!
case 'extendedprofile':
case 'extendedprofilewidget':
include_once $dir . '/lib/' . strtolower($cls) . '.php';
return false;
break;
case 'profile_detail':
require_once dirname(__FILE__) . '/' . ucfirst($lower) . '.php';
include_once $dir . '/classes/' . ucfirst($cls) . '.php';
return false;
break;
default:
return true;
}

View File

@ -139,12 +139,14 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
function parseDate($fieldname, $datestr, $required = false)
{
if (empty($datestr) && $required) {
$msg = sprintf(
_m('You must supply a date for "%s".'),
$fieldname
);
throw new Exception($msg);
if (empty($datestr)) {
if ($required) {
$msg = sprintf(
_m('You must supply a date for "%s".'),
$fieldname
);
throw new Exception($msg);
}
} else {
$ts = strtotime($datestr);
if ($ts === false) {