Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
project
drupal
Commits
e86b041f
Commit
e86b041f
authored
Oct 18, 2004
by
Dries
Browse files
- Modified patch
#11689
by Adrian: made the locale module work with PostgreSQL.
parent
07cdcb43
Changes
5
Hide whitespace changes
Inline
Side-by-side
CHANGELOG.txt
View file @
e86b041f
Drupal 4.5.0 RC,
xxxx-xx-xx
Drupal 4.5.0 RC,
2004-10-18
---------------------------
- navigation:
* made it possible to add, delete, rename and move menu items.
...
...
database/database.mysql
View file @
e86b041f
...
...
@@ -759,7 +759,7 @@ INSERT INTO permission VALUES (1,'access content',0);
INSERT INTO role (rid, name) VALUES (2, 'authenticated user');
INSERT INTO permission VALUES (2,'access comments, access content, post comments, post comments without approval',0);
REPLACE variable SET name='update_start', value='s:10:"2004-10-1
6
;"';
REPLACE variable SET name='update_start', value='s:10:"2004-10-1
8
;"';
REPLACE variable SET name='theme_default', value='s:10:"bluemarine";';
REPLACE blocks SET module = 'user', delta = '0', status = '1';
...
...
database/database.pgsql
View file @
e86b041f
...
...
@@ -307,7 +307,7 @@ CREATE TABLE locales_meta (
CREATE TABLE locales_source (
lid serial,
location
varchar(128)
NOT NULL default '',
location
text
NOT NULL default '',
source text NOT NULL,
PRIMARY KEY (lid)
);
...
...
@@ -322,10 +322,7 @@ CREATE TABLE locales_target (
locale varchar(12) NOT NULL default '',
plid int4 NOT NULL default '0',
plural int4 NOT NULL default '0',
UNIQUE (lid),
UNIQUE (locale),
UNIQUE (plid),
UNIQUE (plural)
UNIQUE (lid)
);
--
...
...
@@ -752,7 +749,7 @@ INSERT INTO system VALUES ('modules/taxonomy.module','taxonomy','module','',1,0,
INSERT INTO system VALUES ('themes/bluemarine/xtemplate.xtmpl','bluemarine','theme','themes/engines/xtemplate/xtemplate.engine',1,0,0);
INSERT INTO system VALUES ('themes/engines/xtemplate/xtemplate.engine','xtemplate','theme_engine','',1,0,0);
INSERT INTO variable(name,value) VALUES('update_start', 's:10:"2004-10-1
6
";');
INSERT INTO variable(name,value) VALUES('update_start', 's:10:"2004-10-1
8
";');
INSERT INTO variable(name,value) VALUES('theme_default','s:10:"bluemarine";');
INSERT INTO users(uid,name,mail) VALUES(0,'','');
INSERT INTO users_roles(uid,rid) VALUES(0, 1);
...
...
database/updates.inc
View file @
e86b041f
...
...
@@ -84,7 +84,8 @@
"2004-09-14"
=>
"update_105"
,
"2004-09-15"
=>
"update_106"
,
"2004-09-17"
=>
"update_107"
,
"2004-10-16"
=>
"update_108"
"2004-10-16"
=>
"update_108"
,
"2004-10-18"
=>
"update_109"
);
function
update_32
()
{
...
...
@@ -1882,6 +1883,7 @@ function update_107() {
}
function
update_108
()
{
$ret
=
array
();
// This update is needed for 4.5-RC sites, where profile data was not being
// wiped from the user->data column correctly because update_80() was faulty.
if
(
!
variable_get
(
'update_80_fix'
,
false
))
{
...
...
@@ -1899,8 +1901,27 @@ function update_108() {
user_save
(
$user
,
$unset
);
}
}
return
$ret
;
}
function
update_109
()
{
$ret
=
array
();
// This is to fix the PostreSQL locales_source table.
if
(
$GLOBALS
[
'db_type'
]
==
'pgsql'
)
{
$ret
[]
=
update_sql
(
"ALTER TABLE
{
locales_source
}
RENAME location TO old_location"
);
$ret
[]
=
update_sql
(
"ALTER TABLE
{
locales_source
}
ADD COLUMN location text"
);
db_query
(
"UPDATE
{
locales_source
}
SET location = old_location"
);
$ret
[]
=
update_sql
(
"ALTER TABLE
{
locales_source
}
ALTER COLUMN location SET NOT NULL"
);
$ret
[]
=
update_sql
(
"ALTER TABLE
{
locales_source
}
ALTER COLUMN location SET DEFAULT ''"
);
$ret
[]
=
update_sql
(
"ALTER TABLE
{
locales_target
}
DROP CONSTRAINT
{
locales_target
}
_locale_key "
);
$ret
[]
=
update_sql
(
"ALTER TABLE
{
locales_target
}
DROP CONSTRAINT
{
locales_target
}
_plid_key "
);
$ret
[]
=
update_sql
(
"ALTER TABLE
{
locales_target
}
DROP CONSTRAINT
{
locales_target
}
_plural_key "
);
}
return
$ret
;
}
function
update_sql
(
$sql
)
{
$edit
=
$_POST
[
"edit"
];
$result
=
db_query
(
$sql
);
...
...
includes/bootstrap.inc
View file @
e86b041f
...
...
@@ -382,7 +382,7 @@ function request_uri() {
$uri
=
$_SERVER
[
'PHP_SELF'
]
.
'?'
.
$_SERVER
[
'QUERY_STRING'
];
}
}
return
check_url
(
$uri
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment