Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
drupal
Manage
Activity
Members
Labels
Plan
Wiki
Custom issue tracker
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
project
drupal
Commits
581bc6a2
Commit
581bc6a2
authored
May 13, 2002
by
Kjartan Mannes
Browse files
Options
Downloads
Patches
Plain Diff
- more coding style fixes.
parent
b81d3d93
Branches
Branches containing commit
Tags
Tags containing commit
2 merge requests
!7452
Issue #1797438. HTML5 validation is preventing form submit and not fully...
,
!789
Issue #3210310: Adjust Database API to remove deprecated Drupal 9 code in Drupal 10
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
includes/common.inc
+1
-1
1 addition, 1 deletion
includes/common.inc
modules/cloud.module
+2
-2
2 additions, 2 deletions
modules/cloud.module
modules/taxonomy.module
+13
-7
13 additions, 7 deletions
modules/taxonomy.module
modules/taxonomy/taxonomy.module
+13
-7
13 additions, 7 deletions
modules/taxonomy/taxonomy.module
with
29 additions
and
17 deletions
includes/common.inc
+
1
−
1
View file @
581bc6a2
...
...
@@ -513,7 +513,7 @@ function format_interval($timestamp) {
function
format_date
(
$timestamp
,
$type
=
"medium"
,
$format
=
""
)
{
global
$user
;
//
$timestamp += ($user->timezone) ? $user->timezone - date("Z") : 0;
$timestamp
+=
(
$user
->
timezone
)
?
$user
->
timezone
-
date
(
"Z"
)
:
0
;
switch
(
$type
)
{
case
"small"
:
...
...
This diff is collapsed.
Click to expand it.
modules/cloud.module
+
2
−
2
View file @
581bc6a2
...
...
@@ -47,11 +47,11 @@ function cloud_update($site) {
** Check whether the site is properly configured:
*/
if
(
!
ereg
(
"^http://|https://|ftp://"
,
$site
[
link
]))
{
if
(
!
ereg
(
"^http://|https://|ftp://"
,
$site
[
"
link
"
]))
{
watchdog
(
"warning"
,
"cloud: invalid or missing URL for '"
.
$site
[
"name"
]
.
"'"
);
}
if
(
!
ereg
(
"^http://|https://|ftp://"
,
$site
[
feed
]))
{
if
(
!
ereg
(
"^http://|https://|ftp://"
,
$site
[
"
feed
"
]))
{
watchdog
(
"warning"
,
"cloud: invalid or missing URL to monitor for '"
.
$site
[
"name"
]
.
"'"
);
}
...
...
This diff is collapsed.
Click to expand it.
modules/taxonomy.module
+
13
−
7
View file @
581bc6a2
...
...
@@ -570,16 +570,20 @@ function taxonomy_admin() {
switch
(
$op
)
{
case
"add"
:
if
(
$type
==
"vocabulary"
)
if
(
$type
==
"vocabulary"
)
{
print
taxonomy_form_vocabulary
();
else
}
else
{
print
taxonomy_form_term
();
}
break
;
case
"edit"
:
if
(
$type
==
"vocabulary"
)
if
(
$type
==
"vocabulary"
)
{
print
taxonomy_form_vocabulary
(
object2array
(
taxonomy_get_vocabulary
(
$id
)));
else
}
else
{
print
taxonomy_form_term
(
object2array
(
taxonomy_get_term
(
$id
)));
}
break
;
case
"preview"
:
print
taxonomy_form
(
$id
);
...
...
@@ -591,10 +595,12 @@ function taxonomy_admin() {
$edit
[
"name"
]
=
0
;
// fall through:
case
"Submit"
:
if
(
$type
==
"vocabulary"
)
if
(
$type
==
"vocabulary"
)
{
print
status
(
taxonomy_save_vocabulary
(
$edit
));
else
}
else
{
print
status
(
taxonomy_save_term
(
$edit
));
}
// fall through:
default
:
print
taxonomy_overview
();
...
...
This diff is collapsed.
Click to expand it.
modules/taxonomy/taxonomy.module
+
13
−
7
View file @
581bc6a2
...
...
@@ -570,16 +570,20 @@ function taxonomy_admin() {
switch
(
$op
)
{
case
"add"
:
if
(
$type
==
"vocabulary"
)
if
(
$type
==
"vocabulary"
)
{
print
taxonomy_form_vocabulary
();
else
}
else
{
print
taxonomy_form_term
();
}
break
;
case
"edit"
:
if
(
$type
==
"vocabulary"
)
if
(
$type
==
"vocabulary"
)
{
print
taxonomy_form_vocabulary
(
object2array
(
taxonomy_get_vocabulary
(
$id
)));
else
}
else
{
print
taxonomy_form_term
(
object2array
(
taxonomy_get_term
(
$id
)));
}
break
;
case
"preview"
:
print
taxonomy_form
(
$id
);
...
...
@@ -591,10 +595,12 @@ function taxonomy_admin() {
$edit
[
"name"
]
=
0
;
// fall through:
case
"Submit"
:
if
(
$type
==
"vocabulary"
)
if
(
$type
==
"vocabulary"
)
{
print
status
(
taxonomy_save_vocabulary
(
$edit
));
else
}
else
{
print
status
(
taxonomy_save_term
(
$edit
));
}
// fall through:
default
:
print
taxonomy_overview
();
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment