GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

trac31 pg support, fixing 2tu typo, set ur1.ca as default service 

darcs-hash:20081113152718-099f7-42b60d02395f016c54c5f3c301f9dbe987c1283f.gz
This commit is contained in:
millette 2008-11-13 10:27:18 -05:00
parent 2a8a0c9399
commit 14f69f8d2e
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actions/othersettings.php
View File

@ -42,8 +42,8 @@ class OthersettingsAction extends SettingsAction {
$services = array(
'' => 'None',
'ur1.ca' => 'ur1.ca (free)',
'2tu.ru' => '2tu.ru (free)',
'ur1.ca' => 'ur1.ca (free service)',
'2tu.us' => '2tu.us (free service)',
'ptiturl.com' => 'ptiturl.com',
'bit.ly' => 'bit.ly',
'tinyurl.com' => 'tinyurl.com',

2
db/laconica.sql
View File

@ -65,7 +65,7 @@ create table user (
smsemail varchar(255) comment 'built from sms and carrier',
uri varchar(255) unique key comment 'universally unique identifier, usually a tag URI',
autosubscribe tinyint default 0 comment 'automatically subscribe to users who subscribe to us',
urlshorteningservice varchar(50) default 'metamark.net' comment 'service to use for auto-shortening URLs',
urlshorteningservice varchar(50) default 'ur1.ca' comment 'service to use for auto-shortening URLs',
created datetime not null comment 'date this record was created',
modified timestamp comment 'date this record was modified',

1
db/laconica_pg.sql
View File

@ -63,6 +63,7 @@ create table "user" (
smsemail varchar(255) /* comment 'built from sms and carrier' */,
uri varchar(255) unique /* comment 'universally unique identifier, usually a tag URI' */,
autosubscribe integer default 0 /* comment 'automatically subscribe to users who subscribe to us' */,
urlshorteningservice varchar(50) default 'ur1.ca' /* comment 'service to use for auto-shortening URLs' */,
created timestamp not null /* comment 'date this record was created' */,
modified timestamp /* comment 'date this record was modified' */

2
lib/util.php
View File

@ -770,7 +770,7 @@ function common_shorten_link($long_url) {
$short_url = $short_url_service->shorten($long_url);
break;
case '2tu.ru':
case '2tu.us':
$short_url_service = new TightUrl;
$short_url = $short_url_service->shorten($long_url);
break;