spelling: the
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
This commit is contained in:
parent
9cc37d5541
commit
c6a9e8be39
|
@ -1623,7 +1623,7 @@ class Probe
|
||||||
if (!empty($feed_data['header']['author-about'])) {
|
if (!empty($feed_data['header']['author-about'])) {
|
||||||
$data['about'] = $feed_data['header']['author-about'];
|
$data['about'] = $feed_data['header']['author-about'];
|
||||||
}
|
}
|
||||||
// OStatus has serious issues when the the url doesn't fit (ssl vs. non ssl)
|
// OStatus has serious issues when the url doesn't fit (ssl vs. non ssl)
|
||||||
// So we take the value that we just fetched, although the other one worked as well
|
// So we take the value that we just fetched, although the other one worked as well
|
||||||
if (!empty($feed_data['header']['author-link'])) {
|
if (!empty($feed_data['header']['author-link'])) {
|
||||||
$data['url'] = $feed_data['header']['author-link'];
|
$data['url'] = $feed_data['header']['author-link'];
|
||||||
|
|
|
@ -248,7 +248,7 @@ class Receiver
|
||||||
* Fetches the object type for a given object id
|
* Fetches the object type for a given object id
|
||||||
*
|
*
|
||||||
* @param array $activity
|
* @param array $activity
|
||||||
* @param string $object_id Object ID of the the provided object
|
* @param string $object_id Object ID of the provided object
|
||||||
* @param integer $uid User ID
|
* @param integer $uid User ID
|
||||||
*
|
*
|
||||||
* @return string with object type or NULL
|
* @return string with object type or NULL
|
||||||
|
@ -1372,7 +1372,7 @@ class Receiver
|
||||||
/**
|
/**
|
||||||
* Fetches the object data from external ressources if needed
|
* Fetches the object data from external ressources if needed
|
||||||
*
|
*
|
||||||
* @param string $object_id Object ID of the the provided object
|
* @param string $object_id Object ID of the provided object
|
||||||
* @param array $object The provided object array
|
* @param array $object The provided object array
|
||||||
* @param boolean $trust_source Do we trust the provided object?
|
* @param boolean $trust_source Do we trust the provided object?
|
||||||
* @param integer $uid User ID for the signature that we use to fetch data
|
* @param integer $uid User ID for the signature that we use to fetch data
|
||||||
|
|
|
@ -1585,7 +1585,7 @@ class DFRN
|
||||||
Logger::info('Process verb ' . $item['verb'] . ' and object-type ' . $item['object-type'] . ' for entrytype ' . $entrytype);
|
Logger::info('Process verb ' . $item['verb'] . ' and object-type ' . $item['object-type'] . ' for entrytype ' . $entrytype);
|
||||||
|
|
||||||
if (($entrytype == self::TOP_LEVEL) && !empty($importer['id'])) {
|
if (($entrytype == self::TOP_LEVEL) && !empty($importer['id'])) {
|
||||||
// The filling of the the "contact" variable is done for legacy reasons
|
// The filling of the "contact" variable is done for legacy reasons
|
||||||
// The functions below are partly used by ostatus.php as well - where we have this variable
|
// The functions below are partly used by ostatus.php as well - where we have this variable
|
||||||
$contact = Contact::selectFirst([], ['id' => $importer['id']]);
|
$contact = Contact::selectFirst([], ['id' => $importer['id']]);
|
||||||
|
|
||||||
|
|
|
@ -2770,7 +2770,7 @@ class Diaspora
|
||||||
}
|
}
|
||||||
|
|
||||||
// Normally we should have a filled "addr" field - but in the past this wasn't the case
|
// Normally we should have a filled "addr" field - but in the past this wasn't the case
|
||||||
// So - just in case - we build the the address here.
|
// So - just in case - we build the address here.
|
||||||
if ($contact['nickname'] != '') {
|
if ($contact['nickname'] != '') {
|
||||||
$nick = $contact['nickname'];
|
$nick = $contact['nickname'];
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -79,7 +79,7 @@ function update_1298()
|
||||||
$a = new \stdClass();
|
$a = new \stdClass();
|
||||||
$a->strings = [];
|
$a->strings = [];
|
||||||
|
|
||||||
// First we get the the localizations
|
// First we get the localizations
|
||||||
if (file_exists('view/lang/$lang/strings.php')) {
|
if (file_exists('view/lang/$lang/strings.php')) {
|
||||||
include 'view/lang/$lang/strings.php';
|
include 'view/lang/$lang/strings.php';
|
||||||
}
|
}
|
||||||
|
|
|
@ -368,7 +368,7 @@
|
||||||
|
|
||||||
// More than just one image.
|
// More than just one image.
|
||||||
if (images.length > 1) {
|
if (images.length > 1) {
|
||||||
// Enable the the button to change the preview pictures.
|
// Enable the button to change the preview pictures.
|
||||||
$('#previewChangeImg_' + id).show();
|
$('#previewChangeImg_' + id).show();
|
||||||
|
|
||||||
if (firstPosted === false) {
|
if (firstPosted === false) {
|
||||||
|
|
|
@ -140,7 +140,7 @@ function openHovercard(targetElement, contactUrl, timeNow) {
|
||||||
.popover({
|
.popover({
|
||||||
html: true,
|
html: true,
|
||||||
placement: function () {
|
placement: function () {
|
||||||
// Calculate the placement of the the hovercard (if top or bottom)
|
// Calculate the placement of the hovercard (if top or bottom)
|
||||||
// The placement depence on the distance between window top and the element
|
// The placement depence on the distance between window top and the element
|
||||||
// which triggers the hover-card
|
// which triggers the hover-card
|
||||||
let get_position = $(targetElement).offset().top - $(window).scrollTop();
|
let get_position = $(targetElement).offset().top - $(window).scrollTop();
|
||||||
|
|
|
@ -266,9 +266,9 @@ function eventHoverHtmlContent(event) {
|
||||||
// Get only template data if there exists location data
|
// Get only template data if there exists location data
|
||||||
if (event.location) {
|
if (event.location) {
|
||||||
var eventLocationText = htmlToText(event.location);
|
var eventLocationText = htmlToText(event.location);
|
||||||
// Get the the html template for formatting the location
|
// Get the html template for formatting the location
|
||||||
var eventLocationTemplate = eventHoverLocationTemplate();
|
var eventLocationTemplate = eventHoverLocationTemplate();
|
||||||
// Format the event location data according to the the event location
|
// Format the event location data according to the event location
|
||||||
// template
|
// template
|
||||||
eventLocation = eventLocationTemplate.format(eventLocationText);
|
eventLocation = eventLocationTemplate.format(eventLocationText);
|
||||||
}
|
}
|
||||||
|
@ -295,7 +295,7 @@ function eventHoverHtmlContent(event) {
|
||||||
return formatted;
|
return formatted;
|
||||||
}
|
}
|
||||||
|
|
||||||
// transform the the list view event element into formatted html
|
// transform the list view event element into formatted html
|
||||||
function formatListViewEvent(event) {
|
function formatListViewEvent(event) {
|
||||||
// The basic template for list view
|
// The basic template for list view
|
||||||
var template =
|
var template =
|
||||||
|
|
|
@ -361,7 +361,7 @@ function toggleJotNav(elm) {
|
||||||
// it redirects you to your own server. In such cases we can't
|
// it redirects you to your own server. In such cases we can't
|
||||||
// load it into a modal.
|
// load it into a modal.
|
||||||
function openWallMessage(url) {
|
function openWallMessage(url) {
|
||||||
// Split the the url in its parts.
|
// Split the url in its parts.
|
||||||
var parts = parseUrl(url);
|
var parts = parseUrl(url);
|
||||||
|
|
||||||
// If the host isn't the same we can't load it in a modal.
|
// If the host isn't the same we can't load it in a modal.
|
||||||
|
|
|
@ -279,7 +279,7 @@ $(document).ready(function () {
|
||||||
// Set the padding for input elements with inline buttons
|
// Set the padding for input elements with inline buttons
|
||||||
//
|
//
|
||||||
// In Frio we use some input elements where the submit button is visually
|
// In Frio we use some input elements where the submit button is visually
|
||||||
// inside the the input field (through css). We need to set a padding-right
|
// inside the input field (through css). We need to set a padding-right
|
||||||
// to the input element where the padding value would be at least the width
|
// to the input element where the padding value would be at least the width
|
||||||
// of the button. Otherwise long user input would be invisible because it is
|
// of the button. Otherwise long user input would be invisible because it is
|
||||||
// behind the button.
|
// behind the button.
|
||||||
|
|
|
@ -47,7 +47,7 @@
|
||||||
{{* The field for event finish time *}}
|
{{* The field for event finish time *}}
|
||||||
{{$f_dsel nofilter}}
|
{{$f_dsel nofilter}}
|
||||||
|
|
||||||
{{* checkbox if the the event doesn't have a finish time *}}
|
{{* checkbox if the event doesn't have a finish time *}}
|
||||||
{{include file="field_checkbox.tpl" field=$nofinish}}
|
{{include file="field_checkbox.tpl" field=$nofinish}}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
@ -170,7 +170,7 @@
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// Fade the the the container from the items we want to delete
|
// Fade the container from the items we want to delete
|
||||||
for(var key in ItemsToDelete) {
|
for(var key in ItemsToDelete) {
|
||||||
$(ItemsToDelete[key]).fadeTo('fast', 0.33);
|
$(ItemsToDelete[key]).fadeTo('fast', 0.33);
|
||||||
};
|
};
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
<div id="remote-logo-img" aria-label="{{$home}}"></div>
|
<div id="remote-logo-img" aria-label="{{$home}}"></div>
|
||||||
</a>
|
</a>
|
||||||
{{else}}
|
{{else}}
|
||||||
{{* #logo-img is the the placeholder to insert a mask (friendica logo) into this div
|
{{* #logo-img is the placeholder to insert a mask (friendica logo) into this div
|
||||||
For Firefox we have to call the paths of the mask (look at the bottom of this file).
|
For Firefox we have to call the paths of the mask (look at the bottom of this file).
|
||||||
Because for FF we need relative paths we apply them with js after the page is loaded (look at theme.js *}}
|
Because for FF we need relative paths we apply them with js after the page is loaded (look at theme.js *}}
|
||||||
<a href="{{$baseurl}}">
|
<a href="{{$baseurl}}">
|
||||||
|
|
|
@ -153,7 +153,7 @@ function frio_contact_photo_menu(&$args)
|
||||||
$pmlink = '';
|
$pmlink = '';
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set the the indicator for opening the status, profile and photo pages
|
// Set the indicator for opening the status, profile and photo pages
|
||||||
// in a new tab to false if the contact a dfrn (friendica) contact
|
// in a new tab to false if the contact a dfrn (friendica) contact
|
||||||
// We do this because we can go back on foreign friendica pages throuhg
|
// We do this because we can go back on foreign friendica pages throuhg
|
||||||
// friendicas "magic-link" which indicates a friendica user on foreign
|
// friendicas "magic-link" which indicates a friendica user on foreign
|
||||||
|
|
Loading…
Reference in New Issue
Block a user