mexon/friendica
1
0
Fork 0
Code Pull requests Activity

rev update

Browse source
This commit is contained in:
friendica 2012-07-21 16:44:15 -07:00
parent 8c83828f83
commit 5255a5c9a9
3 changed files with 33 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -10,7 +10,7 @@ require_once('include/nav.php');
require_once('include/cache.php'); require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '3.0.1410' ); define ( 'FRIENDICA_VERSION', '3.0.1411' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1153 ); define ( 'DB_UPDATE_VERSION', 1153 );

4
mod/register.php
View file

@ -12,7 +12,7 @@ function register_post(&$a) {
call_hooks('register_post', $arr); call_hooks('register_post', $arr);
$max_dailies = intval(get_config('system','max_daily_registrations')); $max_dailies = intval(get_config('system','max_daily_registrations'));
if($max_dailes) { if($max_dailies) {
$r = q("select count(*) as total from user where register_date > UTC_TIMESTAMP - INTERVAL 1 day"); $r = q("select count(*) as total from user where register_date > UTC_TIMESTAMP - INTERVAL 1 day");
if($r && $r[0]['total'] >= $max_dailies) { if($r && $r[0]['total'] >= $max_dailies) {
return; return;
@ -182,7 +182,7 @@ function register_content(&$a) {
} }
$max_dailies = intval(get_config('system','max_daily_registrations')); $max_dailies = intval(get_config('system','max_daily_registrations'));
if($max_dailes) { if($max_dailies) {
$r = q("select count(*) as total from user where register_date > UTC_TIMESTAMP - INTERVAL 1 day"); $r = q("select count(*) as total from user where register_date > UTC_TIMESTAMP - INTERVAL 1 day");
if($r && $r[0]['total'] >= $max_dailies) { if($r && $r[0]['total'] >= $max_dailies) {
logger('max daily registrations exceeded.'); logger('max daily registrations exceeded.');

34
util/messages.po
View file

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 3.0.1410\n" "Project-Id-Version: 3.0.1411\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-07-20 10:00-0700\n" "POT-Creation-Date: 2012-07-21 10:00-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -144,6 +144,7 @@ msgstr ""
#: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93 #: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93
#: ../../addon/drpost/drpost.php:110 ../../addon/startpage/startpage.php:92 #: ../../addon/drpost/drpost.php:110 ../../addon/startpage/startpage.php:92
#: ../../addon/geonames/geonames.php:187 ../../addon/oembed.old/oembed.php:41 #: ../../addon/geonames/geonames.php:187 ../../addon/oembed.old/oembed.php:41
#: ../../addon/forumlist/forumlist.php:169
#: ../../addon/impressum/impressum.php:82 #: ../../addon/impressum/impressum.php:82
#: ../../addon/notimeline/notimeline.php:64 ../../addon/blockem/blockem.php:57 #: ../../addon/notimeline/notimeline.php:64 ../../addon/blockem/blockem.php:57
#: ../../addon/qcomment/qcomment.php:61 #: ../../addon/qcomment/qcomment.php:61
@ -4914,10 +4915,11 @@ msgid "%s - Click to open/close"
msgstr "" msgstr ""
#: ../../addon/page/page.php:61 ../../addon/page/page.php:91 #: ../../addon/page/page.php:61 ../../addon/page/page.php:91
#: ../../addon/forumlist/forumlist.php:54
msgid "Forums" msgid "Forums"
msgstr "" msgstr ""
#: ../../addon/page/page.php:129 #: ../../addon/page/page.php:129 ../../addon/forumlist/forumlist.php:88
msgid "Forums:" msgid "Forums:"
msgstr "" msgstr ""
@ -4929,7 +4931,7 @@ msgstr ""
msgid "Page Settings" msgid "Page Settings"
msgstr "" msgstr ""
#: ../../addon/page/page.php:196 #: ../../addon/page/page.php:196 ../../addon/forumlist/forumlist.php:155
msgid "How many forums to display on sidebar without paging" msgid "How many forums to display on sidebar without paging"
msgstr "" msgstr ""
@ -5417,6 +5419,30 @@ msgstr ""
msgid "URL to embed:" msgid "URL to embed:"
msgstr "" msgstr ""
#: ../../addon/forumlist/forumlist.php:57
msgid "show/hide"
msgstr ""
#: ../../addon/forumlist/forumlist.php:72
msgid "No forum subscriptions"
msgstr ""
#: ../../addon/forumlist/forumlist.php:124
msgid "Forumlist settings updated."
msgstr ""
#: ../../addon/forumlist/forumlist.php:153
msgid "Forumlist Settings"
msgstr ""
#: ../../addon/forumlist/forumlist.php:158
msgid "Randomise Forumlist/Forum list"
msgstr ""
#: ../../addon/forumlist/forumlist.php:161
msgid "Show forumlists/forums on profile forumlist"
msgstr ""
#: ../../addon/impressum/impressum.php:36 #: ../../addon/impressum/impressum.php:36
msgid "Impressum" msgid "Impressum"
msgstr "" msgstr ""