Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

This commit is contained in:
Zach Copley 2010-02-02 23:17:58 +00:00
commit dd1b8076d8
14 changed files with 43 additions and 26 deletions

View File

@ -181,7 +181,7 @@ class File extends Memcached_DataObject
*/
static function validFilename($filename)
{
return preg_match('^/[A-Za-z0-9._-]+$/', $filename);
return preg_match('/^[A-Za-z0-9._-]+$/', $filename);
}
/**

View File

@ -182,21 +182,6 @@ class UserFlagPlugin extends Plugin
return true;
}
/**
* Add our plugin's CSS to page output
*
* @param Action $action action being shown
*
* @return boolean hook result
*/
function onEndShowStatusNetStyles($action)
{
$action->cssLink(common_path('plugins/UserFlag/userflag.css'),
null, 'screen, projection, tv');
return true;
}
/**
* Initialize any flagging buttons on the page
*

View File

@ -54,7 +54,7 @@ class ClearFlagForm extends ProfileActionForm
function formClass()
{
return 'form_entity_clearflag';
return 'form_user_clearflag';
}
/**

View File

@ -1,4 +0,0 @@
.entity_flag input.submit,
.entity_flag p {
background:url(icon_flag.gif) 5px 5px no-repeat;
}

16
scripts/setconfig.php Normal file → Executable file
View File

@ -28,6 +28,7 @@ setconfig.php [options] [section] [setting] <value>
With three args, set the setting to the value.
With two args, just show the setting.
With -d, delete the setting.
With no args, lists all currently set values.
[section] section to use (required)
[setting] setting to use (required)
@ -39,6 +40,21 @@ END_OF_SETCONFIG_HELP;
require_once INSTALLDIR.'/scripts/commandline.inc';
if (empty($args)) {
$count = 0;
$config = new Config();
$config->find();
while ($config->fetch()) {
$count++;
printf("%-20s %-20s %s\n", $config->section, $config->setting,
var_export($config->value, true));
}
if ($count == 0) {
print "No configuration set in database for this site.\n";
}
exit(0);
}
if (count($args) < 2 || count($args) > 3) {
show_help();
exit(1);

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 82 B

View File

Before

Width:  |  Height:  |  Size: 80 B

After

Width:  |  Height:  |  Size: 80 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 9.9 KiB

View File

@ -18,7 +18,7 @@ font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
font-size:1em;
}
address {
margin-right:5.7%;
margin-right:5.3%;
}
input, textarea, select {
border-width:2px;
@ -189,7 +189,10 @@ button.close,
.notice-options .repeated,
.form_notice label[for=notice_data-geo],
button.minimize,
.form_reset_key input.submit {
.form_reset_key input.submit,
.entity_clear input.submit,
.entity_flag input.submit,
.entity_flag p {
background-image:url(../../base/images/icons/icons-01.gif);
background-repeat:no-repeat;
background-color:transparent;
@ -338,6 +341,13 @@ background-position: 5px -1511px;
.form_reset_key input.submit {
background-position: 5px -1973px;
}
.entity_clear input.submit {
background-position: 5px -2039px;
}
.entity_flag input.submit,
.entity_flag p {
background-position: 5px -2105px;
}
/* NOTICES */
.notice .attachment {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 9.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

View File

@ -189,7 +189,10 @@ button.close,
.notice-options .repeated,
.form_notice label[for=notice_data-geo],
button.minimize,
.form_reset_key input.submit {
.form_reset_key input.submit,
.entity_clear input.submit,
.entity_flag input.submit,
.entity_flag p {
background-image:url(../../base/images/icons/icons-01.gif);
background-repeat:no-repeat;
background-color:transparent;
@ -337,6 +340,13 @@ background-position: 5px -1511px;
.form_reset_key input.submit {
background-position: 5px -1973px;
}
.entity_clear input.submit {
background-position: 5px -2039px;
}
.entity_flag input.submit,
.entity_flag p {
background-position: 5px -2105px;
}
/* NOTICES */
.notice .attachment {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB