mirror of
https://github.com/friendica/friendica
synced 2024-12-23 12:00:16 +00:00
undefined fn: init_groups_visitor in mod_profile, rev update
This commit is contained in:
friendica
parent
2347a4326c
commit
02251f23df
5 changed files with 55 additions and 53 deletions
2
boot.php
2
boot.php
|
|
@ -11,7 +11,7 @@ require_once('include/cache.php');
|
|||
require_once('library/Mobile_Detect/Mobile_Detect.php');
|
||||
|
||||
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
||||
define ( 'FRIENDICA_VERSION', '3.0.1500' );
|
||||
define ( 'FRIENDICA_VERSION', '3.0.1503' );
|
||||
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
|
||||
define ( 'DB_UPDATE_VERSION', 1156 );
|
||||
|
||||
|
|
|
|||
|
|
@ -168,23 +168,4 @@ else {
|
|||
}
|
||||
}
|
||||
|
||||
// Returns an array of group id's this contact is a member of.
|
||||
// This array will only contain group id's related to the uid of this
|
||||
// DFRN contact. They are *not* neccessarily unique across the entire site.
|
||||
|
||||
|
||||
if(! function_exists('init_groups_visitor')) {
|
||||
function init_groups_visitor($contact_id) {
|
||||
$groups = array();
|
||||
$r = q("SELECT `gid` FROM `group_member`
|
||||
WHERE `contact-id` = %d ",
|
||||
intval($contact_id)
|
||||
);
|
||||
if(count($r)) {
|
||||
foreach($r as $rr)
|
||||
$groups[] = $rr['gid'];
|
||||
}
|
||||
return $groups;
|
||||
}}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -76,6 +76,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
|
|||
killme();
|
||||
|
||||
$contact = $r[0];
|
||||
require_once('include/security.php');
|
||||
$groups = init_groups_visitor($contact['id']);
|
||||
|
||||
if(count($groups)) {
|
||||
|
|
|
|||
|
|
@ -371,3 +371,23 @@ function check_form_security_token_ForbiddenOnErr($typename = '', $formname = 'f
|
|||
killme();
|
||||
}
|
||||
}
|
||||
|
||||
// Returns an array of group id's this contact is a member of.
|
||||
// This array will only contain group id's related to the uid of this
|
||||
// DFRN contact. They are *not* neccessarily unique across the entire site.
|
||||
|
||||
|
||||
if(! function_exists('init_groups_visitor')) {
|
||||
function init_groups_visitor($contact_id) {
|
||||
$groups = array();
|
||||
$r = q("SELECT `gid` FROM `group_member`
|
||||
WHERE `contact-id` = %d ",
|
||||
intval($contact_id)
|
||||
);
|
||||
if(count($r)) {
|
||||
foreach($r as $rr)
|
||||
$groups[] = $rr['gid'];
|
||||
}
|
||||
return $groups;
|
||||
}}
|
||||
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@
|
|||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: 3.0.1500\n"
|
||||
"Project-Id-Version: 3.0.1503\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2012-10-18 10:00-0700\n"
|
||||
"POT-Creation-Date: 2012-10-21 10:00-0700\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
|
@ -281,7 +281,7 @@ msgstr ""
|
|||
msgid "Edit event"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/events.php:323 ../../include/text.php:1187
|
||||
#: ../../mod/events.php:323 ../../include/text.php:1185
|
||||
msgid "link to source"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -484,7 +484,7 @@ msgstr ""
|
|||
|
||||
#: ../../mod/photos.php:606 ../../mod/like.php:145 ../../mod/subthread.php:87
|
||||
#: ../../mod/tagger.php:62 ../../addon/communityhome/communityhome.php:163
|
||||
#: ../../view/theme/diabook/theme.php:464 ../../include/text.php:1439
|
||||
#: ../../view/theme/diabook/theme.php:464 ../../include/text.php:1437
|
||||
#: ../../include/diaspora.php:1835 ../../include/conversation.php:125
|
||||
#: ../../include/conversation.php:253
|
||||
#: ../../addon.old/communityhome/communityhome.php:163
|
||||
|
|
@ -1291,7 +1291,7 @@ msgstr ""
|
|||
|
||||
#: ../../mod/localtime.php:26
|
||||
msgid ""
|
||||
"Friendika provides this service for sharing events with other networks and "
|
||||
"Friendica provides this service for sharing events with other networks and "
|
||||
"friends in unknown timezones."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -1405,7 +1405,7 @@ msgid_plural "%d comments"
|
|||
msgstr[0] ""
|
||||
msgstr[1] ""
|
||||
|
||||
#: ../../mod/content.php:588 ../../include/text.php:1443
|
||||
#: ../../mod/content.php:588 ../../include/text.php:1441
|
||||
#: ../../object/Item.php:279 ../../object/Item.php:292
|
||||
msgid "comment"
|
||||
msgid_plural "comments"
|
||||
|
|
@ -5560,7 +5560,7 @@ msgid "Latest likes"
|
|||
msgstr ""
|
||||
|
||||
#: ../../addon/communityhome/communityhome.php:155
|
||||
#: ../../view/theme/diabook/theme.php:456 ../../include/text.php:1437
|
||||
#: ../../view/theme/diabook/theme.php:456 ../../include/text.php:1435
|
||||
#: ../../include/conversation.php:117 ../../include/conversation.php:245
|
||||
#: ../../addon.old/communityhome/communityhome.php:155
|
||||
msgid "event"
|
||||
|
|
@ -5714,7 +5714,7 @@ msgstr ""
|
|||
#: ../../addon/dav/common/wdcal_edit.inc.php:254
|
||||
#: ../../addon/dav/common/wdcal_edit.inc.php:270
|
||||
#: ../../addon/dav/common/wdcal_edit.inc.php:293
|
||||
#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:917
|
||||
#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:915
|
||||
#: ../../addon.old/dav/common/wdcal_edit.inc.php:231
|
||||
#: ../../addon.old/dav/common/wdcal_edit.inc.php:254
|
||||
#: ../../addon.old/dav/common/wdcal_edit.inc.php:270
|
||||
|
|
@ -5725,7 +5725,7 @@ msgstr ""
|
|||
|
||||
#: ../../addon/dav/common/wdcal_edit.inc.php:235
|
||||
#: ../../addon/dav/common/wdcal_edit.inc.php:274
|
||||
#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:917
|
||||
#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:915
|
||||
#: ../../addon.old/dav/common/wdcal_edit.inc.php:235
|
||||
#: ../../addon.old/dav/common/wdcal_edit.inc.php:274
|
||||
#: ../../addon.old/dav/common/wdcal_edit.inc.php:308
|
||||
|
|
@ -5733,35 +5733,35 @@ msgid "Monday"
|
|||
msgstr ""
|
||||
|
||||
#: ../../addon/dav/common/wdcal_edit.inc.php:238
|
||||
#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:917
|
||||
#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:915
|
||||
#: ../../addon.old/dav/common/wdcal_edit.inc.php:238
|
||||
#: ../../addon.old/dav/common/wdcal_edit.inc.php:277
|
||||
msgid "Tuesday"
|
||||
msgstr ""
|
||||
|
||||
#: ../../addon/dav/common/wdcal_edit.inc.php:241
|
||||
#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:917
|
||||
#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:915
|
||||
#: ../../addon.old/dav/common/wdcal_edit.inc.php:241
|
||||
#: ../../addon.old/dav/common/wdcal_edit.inc.php:280
|
||||
msgid "Wednesday"
|
||||
msgstr ""
|
||||
|
||||
#: ../../addon/dav/common/wdcal_edit.inc.php:244
|
||||
#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:917
|
||||
#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:915
|
||||
#: ../../addon.old/dav/common/wdcal_edit.inc.php:244
|
||||
#: ../../addon.old/dav/common/wdcal_edit.inc.php:283
|
||||
msgid "Thursday"
|
||||
msgstr ""
|
||||
|
||||
#: ../../addon/dav/common/wdcal_edit.inc.php:247
|
||||
#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:917
|
||||
#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:915
|
||||
#: ../../addon.old/dav/common/wdcal_edit.inc.php:247
|
||||
#: ../../addon.old/dav/common/wdcal_edit.inc.php:286
|
||||
msgid "Friday"
|
||||
msgstr ""
|
||||
|
||||
#: ../../addon/dav/common/wdcal_edit.inc.php:250
|
||||
#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:917
|
||||
#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:915
|
||||
#: ../../addon.old/dav/common/wdcal_edit.inc.php:250
|
||||
#: ../../addon.old/dav/common/wdcal_edit.inc.php:289
|
||||
msgid "Saturday"
|
||||
|
|
@ -8294,79 +8294,79 @@ msgstr ""
|
|||
msgid "surprised"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/text.php:921
|
||||
#: ../../include/text.php:919
|
||||
msgid "January"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/text.php:921
|
||||
#: ../../include/text.php:919
|
||||
msgid "February"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/text.php:921
|
||||
#: ../../include/text.php:919
|
||||
msgid "March"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/text.php:921
|
||||
#: ../../include/text.php:919
|
||||
msgid "April"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/text.php:921
|
||||
#: ../../include/text.php:919
|
||||
msgid "May"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/text.php:921
|
||||
#: ../../include/text.php:919
|
||||
msgid "June"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/text.php:921
|
||||
#: ../../include/text.php:919
|
||||
msgid "July"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/text.php:921
|
||||
#: ../../include/text.php:919
|
||||
msgid "August"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/text.php:921
|
||||
#: ../../include/text.php:919
|
||||
msgid "September"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/text.php:921
|
||||
#: ../../include/text.php:919
|
||||
msgid "October"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/text.php:921
|
||||
#: ../../include/text.php:919
|
||||
msgid "November"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/text.php:921
|
||||
#: ../../include/text.php:919
|
||||
msgid "December"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/text.php:1007
|
||||
#: ../../include/text.php:1005
|
||||
msgid "bytes"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/text.php:1034 ../../include/text.php:1046
|
||||
#: ../../include/text.php:1032 ../../include/text.php:1044
|
||||
msgid "Click to open/close"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/text.php:1219 ../../include/user.php:236
|
||||
#: ../../include/text.php:1217 ../../include/user.php:236
|
||||
msgid "default"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/text.php:1231
|
||||
#: ../../include/text.php:1229
|
||||
msgid "Select an alternate language"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/text.php:1441
|
||||
#: ../../include/text.php:1439
|
||||
msgid "activity"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/text.php:1444
|
||||
#: ../../include/text.php:1442
|
||||
msgid "post"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/text.php:1599
|
||||
#: ../../include/text.php:1597
|
||||
msgid "Item filed"
|
||||
msgstr ""
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue