Commit a55a0d99 authored by webchick's avatar webchick

#412410 by c960657: Make schema descriptions plain text.

parent 1957c641
...@@ -349,9 +349,6 @@ public function changeField(&$ret, $table, $field, $field_new, $spec, $keys_new ...@@ -349,9 +349,6 @@ public function changeField(&$ret, $table, $field, $field_new, $spec, $keys_new
} }
public function prepareComment($comment, $length = NULL) { 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 // Work around a bug in some versions of PDO, see http://bugs.php.net/bug.php?id=41125
$comment = str_replace("'", '’', $comment); $comment = str_replace("'", '’', $comment);
......
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
* *
* The following keys are defined: * The following keys are defined:
* *
* - 'description': A string describing this table and its purpose. * - 'description': A string in non-markup plain text describing this table
* References to other tables should be enclosed in * and its purpose. References to other tables should be enclosed in
* curly-brackets. For example, the node_revisions table * curly-brackets. For example, the node_revisions table
* description field might contain "Stores per-revision title and * description field might contain "Stores per-revision title and
* body data for each {node}." * body data for each {node}."
...@@ -34,8 +34,8 @@ ...@@ -34,8 +34,8 @@
* that describes the table's database columns. The specification * that describes the table's database columns. The specification
* is also an array. The following specification parameters are defined: * is also an array. The following specification parameters are defined:
* *
* - 'description': A string describing this field and its purpose. * - 'description': A string in non-markup plain text describing this field
* References to other tables should be enclosed in * and its purpose. References to other tables should be enclosed in
* curly-brackets. For example, the node table vid field * curly-brackets. For example, the node table vid field
* description might contain "Always holds the largest (most * description might contain "Always holds the largest (most
* recent) {node_revision}.vid value for this nid." * recent) {node_revision}.vid value for this nid."
...@@ -44,8 +44,8 @@ ...@@ -44,8 +44,8 @@
* just map to the according database engine specific * just map to the according database engine specific
* datatypes. Use 'serial' for auto incrementing fields. This * datatypes. Use 'serial' for auto incrementing fields. This
* will expand to 'int auto_increment' on mysql. * will expand to 'int auto_increment' on mysql.
* - 'serialize': A boolean indicating whether the field will be stored * - 'serialize': A boolean indicating whether the field will be stored as
as a serialized string. * a serialized string.
* - 'size': The data size: 'tiny', 'small', 'medium', 'normal', * - 'size': The data size: 'tiny', 'small', 'medium', 'normal',
* 'big'. This is a hint about the largest value the field will * 'big'. This is a hint about the largest value the field will
* store and determines which of the database engine specific * store and determines which of the database engine specific
...@@ -530,8 +530,6 @@ public function fieldNames($fields) { ...@@ -530,8 +530,6 @@ public function fieldNames($fields) {
* The prepared comment. * The prepared comment.
*/ */
public function prepareComment($comment, $length = NULL) { public function prepareComment($comment, $length = NULL) {
// Decode HTML-encoded comments.
$comment = decode_entities(strip_tags($comment));
return $this->connection->quote($comment); return $this->connection->quote($comment);
} }
} }
......
...@@ -159,13 +159,13 @@ function aggregator_schema() { ...@@ -159,13 +159,13 @@ function aggregator_schema() {
'length' => 255, 'length' => 255,
'not null' => TRUE, 'not null' => TRUE,
'default' => '', 'default' => '',
'description' => 'The parent website of the feed; comes from the &lt;link&gt; element in the feed.', 'description' => 'The parent website of the feed; comes from the <link> element in the feed.',
), ),
'description' => array( 'description' => array(
'type' => 'text', 'type' => 'text',
'not null' => TRUE, 'not null' => TRUE,
'size' => 'big', 'size' => 'big',
'description' => "The parent website's description; comes from the &lt;description&gt; element in the feed.", 'description' => "The parent website's description; comes from the <description> element in the feed.",
), ),
'image' => array( 'image' => array(
'type' => 'text', 'type' => 'text',
......
...@@ -84,7 +84,7 @@ function block_schema() { ...@@ -84,7 +84,7 @@ function block_schema() {
'length' => 64, 'length' => 64,
'not null' => TRUE, 'not null' => TRUE,
'default' => '', 'default' => '',
'description' => 'Custom title for the block. (Empty string will use block default title, &lt;none&gt; will remove the title, text will cause block to use specified title.)', 'description' => 'Custom title for the block. (Empty string will use block default title, <none> will remove the title, text will cause block to use specified title.)',
), ),
'cache' => array( 'cache' => array(
'type' => 'int', 'type' => 'int',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment