diff options
| author | Dries Buytaert <dries@buytaert.net> | 2002-04-20 11:52:50 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2002-04-20 11:52:50 +0000 |
| commit | 8043cb998f3325731bfab8d82251fa49639aec1d (patch) | |
| tree | 3774b206865eb631134c447aa36e90af762b8c5b /modules/drupal/drupal.module | |
| parent | 0a966e1ed42d1b7d0827b0318bcefb7101ac56df (diff) | |
| download | brdo-8043cb998f3325731bfab8d82251fa49639aec1d.tar.gz brdo-8043cb998f3325731bfab8d82251fa49639aec1d.tar.bz2 | |
- Applied Marco's big patch, including contributions from Moshe:
+ Changed the db_query() API.
+ Wrapped all links in l(), lm(), la(), ..., drupal_url() functions.
+ XHTML-ified some HTML.
+ Wrapped a lot of text in the administrative pages in a t()
function.
+ Replaced all $REQUEST_URI/$PATH_INFOs by request_uri().
+ Small bugfixes (eg. bug in book_export_html() and clean-ups (eg.
RSS code).
+ Fixed some bugs in the taxonomy module (eg. tree making bug), added
new functionality (eg. new APIs for use by other modules), included
Moshe's taxonomy extensions, and some documentation udpates.
+ ...
Diffstat (limited to 'modules/drupal/drupal.module')
| -rw-r--r-- | modules/drupal/drupal.module | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/drupal/drupal.module b/modules/drupal/drupal.module index da8536141..2c94f332f 100644 --- a/modules/drupal/drupal.module +++ b/modules/drupal/drupal.module @@ -51,8 +51,8 @@ function drupal_directory_ping($arguments) { */ if ($link && $name && $mail && $slogan && $mission) { - db_query("DELETE FROM directory WHERE link = '". check_query($link) ."' OR mail = '". check_query($mail) ."'"); - db_query("INSERT INTO directory (link, name, mail, slogan, mission, timestamp) VALUES ('". check_query($link) ."', '". check_query($name) ."', '". check_query($mail) ."', '". check_query($slogan) ."', '". check_query($mission) ."', '". time() ."')"); + db_query("DELETE FROM directory WHERE link = '%s' OR mail = '%s'", $link, $mail); + db_query("INSERT INTO directory (link, name, mail, slogan, mission, timestamp) VALUES ('%s', '%s', '%s', '%s', '%s', '%s')", $link, $name, $mail, $slogan, $mission, time()); watchdog("message", "directory: ping from '$name' ($link)"); @@ -135,7 +135,7 @@ function drupal_auth_help() { $output = "<p><a href=\"http://www.drupal.org\">Drupal</a> is the name of the software which powers %s. There are Drupal websites all over the world, and many of them share their registration databases so that users may freely login to any Drupal site using a single <b>Drupal ID</b>.</p>\n"; $output .= "<p>So please feel free to login to your account here at %s with a username from another Drupal site. The format of a Drupal ID is similar to an email address: <b>username</b>@<i>server</i>. An example of valid Drupal ID is <b>mwlily</b><i>@www.drupal.org</i>.</p>"; - return strtr(t($output), array("%s" => "<i>$site</i>")); + return t($output, array("%s" => "<i>$site</i>")); } function drupal_user($type, $edit, $user) { |