harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor "which link to show" logic

Browse Source
This commit is contained in:
Friendika
2011-05-06 06:30:33 -07:00
parent 34f3cb68a6
commit 2c63b65e3c
3 changed files with 106 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
boot.php
View File

@@ -212,6 +212,7 @@ class App {
public $user;
public $cid;
public $contact;
public $contacts;
public $page_contact;
public $content;
public $data;
@@ -2454,6 +2455,13 @@ function get_birthdays() {
}}
if(! function_exists('normalise_link')) {
function normalise_link($url) {
$ret = str_replace(array('https:','//www.'), array('http:','//'), $url);
return(rtrim($ret,'/'));
}}
/**
*
* Compare two URLs to see if they are the same, but ignore
@@ -2467,9 +2475,7 @@ function get_birthdays() {
if(! function_exists('link_compare')) {
function link_compare($a,$b) {
$a1 = str_replace(array('https:','//www.'), array('http:','//'), $a);
$b1 = str_replace(array('https:','//www.'), array('http:','//'), $b);
if(strcasecmp($a1,$b1) === 0)
if(strcasecmp(normalise_link($a),normalise_link($b)) === 0)
return true;
return false;
}}