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

Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

This commit is contained in:
Evan Prodromou 2009-12-08 21:18:49 -05:00
parent 45408142e9 2f59f0ddb5
commit fcce5a064a
4 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
classes/Forward.php
View File

@ -77,7 +77,8 @@ class Forward extends Memcached_DataObject
$user = new User();
$user->query('SELECT user.* FROM user JOIN subscription ON user.id = subscription.subscriber '.
$usertable = common_database_tablename('user');
$user->query("SELECT $usertable.* FROM $usertable INNER JOIN subscription ON $usertable.id = subscription.subscriber ".
'WHERE subscription.subscribed = '.$this->profile_id);
$ni = array();

18
db/08to09_pg.sql
View File

@ -39,6 +39,16 @@ create table profile_role (
);
create table location_namespace (
id integer /*comment 'identity for this namespace'*/,
description text /* comment 'description of the namespace'*/ ,
created integer not null /*comment 'date the record was created*/ ,
/* modified timestamp comment 'date this record was modified',*/
primary key (id)
);
create table login_token (
user_id integer not null /* comment 'user owning this token'*/ references "user" (id),
token char(32) not null /* comment 'token useable for logging in'*/,
@ -69,3 +79,11 @@ ALTER TABLE profile ADD COLUMN lat decimal(10,7) /*comment 'latitude'*/ ;
ALTER TABLE profile ADD COLUMN lon decimal(10,7) /*comment 'longitude'*/;
ALTER TABLE profile ADD COLUMN location_id integer /* comment 'location id if possible'*/;
ALTER TABLE profile ADD COLUMN location_ns integer /* comment 'namespace for location'*/;
CREATE TABLE forward (
profile_id integer not null /*comment 'profile who forwarded the notice'*/ references profile (id),
notice_id integer not null /*comment 'notice they forwarded'*/ references notice (id),
created timestamp not null /*comment 'date this record was created'*/ DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (profile_id, notice_id)
);

18
db/statusnet_pg.sql
View File

@ -572,6 +572,18 @@ create table profile_role (
);
create table location_namespace (
id integer /*comment 'identity for this namespace'*/,
description text /* comment 'description of the namespace'*/ ,
created integer not null /*comment 'date the record was created*/ ,
/* modified timestamp comment 'date this record was modified',*/
primary key (id)
);
create table login_token (
user_id integer not null /* comment 'user owning this token'*/ references "user" (id),
token char(32) not null /* comment 'token useable for logging in'*/,
@ -581,3 +593,9 @@ create table login_token (
primary key (user_id)
);
CREATE TABLE forward (
profile_id integer not null /*comment 'profile who forwarded the notice'*/ references profile (id),
notice_id integer not null /*comment 'notice they forwarded'*/ references notice (id),
created timestamp not null /*comment 'date this record was created'*/ DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (profile_id, notice_id)
);

2
lib/language.php
View File

@ -153,7 +153,7 @@ if (!function_exists('npgettext')) {
*/
function _m($msg/*, ...*/)
{
$domain = _mdomain(debug_backtrace(false));
$domain = _mdomain(debug_backtrace());
$args = func_get_args();
switch(count($args)) {
case 1: return dgettext($domain, $msg);