diff options
| -rw-r--r-- | actions/othersettings.php | 4 | ||||
| -rw-r--r-- | db/laconica.sql | 2 | ||||
| -rw-r--r-- | db/laconica_pg.sql | 1 | ||||
| -rw-r--r-- | lib/util.php | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/actions/othersettings.php b/actions/othersettings.php index d4a27db20..9f1ad9949 100644 --- a/actions/othersettings.php +++ b/actions/othersettings.php @@ -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', diff --git a/db/laconica.sql b/db/laconica.sql index d9a6dbf86..d1e5a76a5 100644 --- a/db/laconica.sql +++ b/db/laconica.sql @@ -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', diff --git a/db/laconica_pg.sql b/db/laconica_pg.sql index 8d0db9a80..d027dc0af 100644 --- a/db/laconica_pg.sql +++ b/db/laconica_pg.sql @@ -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' */
diff --git a/lib/util.php b/lib/util.php index 14311a71d..3b2ee9d87 100644 --- a/lib/util.php +++ b/lib/util.php @@ -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; |