diff options
author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-08-02 08:16:16 +0000 |
---|---|---|
committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-08-02 08:16:16 +0000 |
commit | a55a0d99d1a2bd7368fdbb0831f4864e97af6752 (patch) | |
tree | c878419dcc26efdc76b96913623c391a2cb11297 /includes | |
parent | 1957c641e5e04b1fcd503b84511d097aa2d101c5 (diff) | |
download | brdo-a55a0d99d1a2bd7368fdbb0831f4864e97af6752.tar.gz brdo-a55a0d99d1a2bd7368fdbb0831f4864e97af6752.tar.bz2 |
#412410 by c960657: Make schema descriptions plain text.
Diffstat (limited to 'includes')
-rw-r--r-- | includes/database/mysql/schema.inc | 3 | ||||
-rw-r--r-- | includes/database/schema.inc | 14 |
2 files changed, 6 insertions, 11 deletions
diff --git a/includes/database/mysql/schema.inc b/includes/database/mysql/schema.inc index 48e4c2eb7..827f274aa 100644 --- a/includes/database/mysql/schema.inc +++ b/includes/database/mysql/schema.inc @@ -349,9 +349,6 @@ class DatabaseSchema_mysql extends DatabaseSchema { } public function prepareComment($comment, $length = NULL) { - // Decode HTML-encoded comments. - $comment = decode_entities(strip_tags($comment)); - // Work around a bug in some versions of PDO, see http://bugs.php.net/bug.php?id=41125 $comment = str_replace("'", '’', $comment); diff --git a/includes/database/schema.inc b/includes/database/schema.inc index a6dbcc53d..442fedd69 100644 --- a/includes/database/schema.inc +++ b/includes/database/schema.inc @@ -25,8 +25,8 @@ * * The following keys are defined: * - * - 'description': A string describing this table and its purpose. - * References to other tables should be enclosed in + * - 'description': A string in non-markup plain text describing this table + * and its purpose. References to other tables should be enclosed in * curly-brackets. For example, the node_revisions table * description field might contain "Stores per-revision title and * body data for each {node}." @@ -34,8 +34,8 @@ * that describes the table's database columns. The specification * is also an array. The following specification parameters are defined: * - * - 'description': A string describing this field and its purpose. - * References to other tables should be enclosed in + * - 'description': A string in non-markup plain text describing this field + * and its purpose. References to other tables should be enclosed in * curly-brackets. For example, the node table vid field * description might contain "Always holds the largest (most * recent) {node_revision}.vid value for this nid." @@ -44,8 +44,8 @@ * just map to the according database engine specific * datatypes. Use 'serial' for auto incrementing fields. This * will expand to 'int auto_increment' on mysql. - * - 'serialize': A boolean indicating whether the field will be stored - as a serialized string. + * - 'serialize': A boolean indicating whether the field will be stored as + * a serialized string. * - 'size': The data size: 'tiny', 'small', 'medium', 'normal', * 'big'. This is a hint about the largest value the field will * store and determines which of the database engine specific @@ -530,8 +530,6 @@ abstract class DatabaseSchema { * The prepared comment. */ public function prepareComment($comment, $length = NULL) { - // Decode HTML-encoded comments. - $comment = decode_entities(strip_tags($comment)); return $this->connection->quote($comment); } } |