Handling of special characters

diff --git a/doc/database.md b/doc/database.md
index 5e5413916d32344f3be196bc3b42407370134006..60e3253fe33f209fd980b41896dbc43593659e69 100644 (file)
--- a/doc/database.md
+++ b/doc/database.md
@@ -45,7 +45,7 @@ Database Tables
 | [notify-threads](help/database/db_notify-threads) |  |
 | [oembed](help/database/db_oembed) | cache for OEmbed queries |
 | [openwebauth-token](help/database/db_openwebauth-token) | Store OpenWebAuth token to verify contacts |
-| [parsed_url](help/database/db_parsed_url) | cache for 'parse_url' queries |
+| [parsed_url](help/database/db_parsed_url) | cache for 'parse_url' queries |
 | [pconfig](help/database/db_pconfig) | personal (per user) configuration storage |
 | [permissionset](help/database/db_permissionset) |  |
 | [photo](help/database/db_photo) | photo storage |

diff --git a/doc/database/db_apcontact.md b/doc/database/db_apcontact.md
index 5f5d21e4ebfe28b6c42cb417c72a77b99b539c25..539be251ae7805ae757c7b885daf930a24acd2b2 100644 (file)
--- a/doc/database/db_apcontact.md
+++ b/doc/database/db_apcontact.md
@@ -27,7 +27,7 @@ Fields
 | subscribe        |                              | varchar(255)   | YES  |     | NULL                |       |
 | baseurl          | baseurl of the ap contact    | varchar(255)   | YES  |     | NULL                |       |
 | gsid             | Global Server ID             | int unsigned   | YES  |     | NULL                |       |
-| generator        | Name of the contact's system | varchar(255)   | YES  |     | NULL                |       |
+| generator        | Name of the contact's system | varchar(255)   | YES  |     | NULL                |       |
 | following_count  | Number of following contacts | int unsigned   | YES  |     | 0                   |       |
 | followers_count  | Number of followers          | int unsigned   | YES  |     | 0                   |       |
 | statuses_count   | Number of posts              | int unsigned   | YES  |     | 0                   |       |

diff --git a/doc/database/db_attach.md b/doc/database/db_attach.md
index 9eb0f36e94e93f27d68d1a93b2deb1c64c539c6e..76d8e01f2094a64c1fc38eac7b39cefcfe82195c 100644 (file)
--- a/doc/database/db_attach.md
+++ b/doc/database/db_attach.md
@@ -17,7 +17,7 @@ Fields
 | data          | file data                                             | longblob           | NO   |     | NULL                |                |
 | created       | creation time                                         | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
 | edited        | last edit time                                        | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
-| allow_cid     | Access Control - list of allowed contact.id '<19><78> | mediumtext         | YES  |     | NULL                |                |
+| allow_cid     | Access Control - list of allowed contact.id '<19><78> | mediumtext         | YES  |     | NULL                |                |
 | allow_gid     | Access Control - list of allowed groups               | mediumtext         | YES  |     | NULL                |                |
 | deny_cid      | Access Control - list of denied contact.id            | mediumtext         | YES  |     | NULL                |                |
 | deny_gid      | Access Control - list of denied groups                | mediumtext         | YES  |     | NULL                |                |

diff --git a/doc/database/db_event.md b/doc/database/db_event.md
index d8b009639f020cbaef9f6ff9dba54d375b419e68..37048599bb91d145f9c4a694ae295d0940012efd 100644 (file)
--- a/doc/database/db_event.md
+++ b/doc/database/db_event.md
@@ -24,7 +24,7 @@ Fields
 | nofinish  | if event does have no end this is 1                    | boolean            | NO   |     | 0                   |                |
 | adjust    | adjust to timezone of the recipient (0 or 1)           | boolean            | NO   |     | 1                   |                |
 | ignore    | 0 or 1                                                 | boolean            | NO   |     | 0                   |                |
-| allow_cid | Access Control - list of allowed contact.id '<19><78>' | mediumtext         | YES  |     | NULL                |                |
+| allow_cid | Access Control - list of allowed contact.id '<19><78>' | mediumtext         | YES  |     | NULL                |                |
 | allow_gid | Access Control - list of allowed groups                | mediumtext         | YES  |     | NULL                |                |
 | deny_cid  | Access Control - list of denied contact.id             | mediumtext         | YES  |     | NULL                |                |
 | deny_gid  | Access Control - list of denied groups                 | mediumtext         | YES  |     | NULL                |                |

diff --git a/doc/database/db_parsed_url.md b/doc/database/db_parsed_url.md
index 67ea5caebf69c404fe6b7558b34644f442cddeb1..1752cd0b5b1e8fea5018102e20e70a245d70143d 100644 (file)
--- a/doc/database/db_parsed_url.md
+++ b/doc/database/db_parsed_url.md
@@ -1,7 +1,7 @@
 Table parsed_url
 ===========
 
-cache for 'parse_url' queries
+cache for 'parse_url' queries
 
 Fields
 ------
@@ -9,7 +9,7 @@ Fields
 | Field    | Description                       | Type       | Null | Key | Default             | Extra |
 | -------- | --------------------------------- | ---------- | ---- | --- | ------------------- | ----- |
 | url_hash | page url hash                     | binary(64) | NO   | PRI | NULL                |       |
-| guessing | is the 'guessing' mode active?    | boolean    | NO   | PRI | 0                   |       |
+| guessing | is the 'guessing' mode active?    | boolean    | NO   | PRI | 0                   |       |
 | oembed   | is the data the result of oembed? | boolean    | NO   | PRI | 0                   |       |
 | url      | page url                          | text       | NO   |     | NULL                |       |
 | content  | page data                         | mediumtext | YES  |     | NULL                |       |

diff --git a/doc/database/db_permissionset.md b/doc/database/db_permissionset.md
index 107cedea188be275ef9a6d5a34a4723cb3de4484..38c6fe8f3150fcae798711820d51aff00ada947a 100644 (file)
--- a/doc/database/db_permissionset.md
+++ b/doc/database/db_permissionset.md
@@ -10,7 +10,7 @@ Fields
 | --------- | ------------------------------------------------------ | ------------------ | ---- | --- | ------- | -------------- |
 | id        | sequential ID                                          | int unsigned       | NO   | PRI | NULL    | auto_increment |
 | uid       | Owner id of this permission set                        | mediumint unsigned | NO   |     | 0       |                |
-| allow_cid | Access Control - list of allowed contact.id '<19><78>' | mediumtext         | YES  |     | NULL    |                |
+| allow_cid | Access Control - list of allowed contact.id '<19><78>' | mediumtext         | YES  |     | NULL    |                |
 | allow_gid | Access Control - list of allowed groups                | mediumtext         | YES  |     | NULL    |                |
 | deny_cid  | Access Control - list of denied contact.id             | mediumtext         | YES  |     | NULL    |                |
 | deny_gid  | Access Control - list of denied groups                 | mediumtext         | YES  |     | NULL    |                |

diff --git a/doc/database/db_photo.md b/doc/database/db_photo.md
index aad26bdbeb744a3f14ff16aefe12674b61e065b0..b641ae4596ecfbd76d52f575ddcf2dca66b1f2f3 100644 (file)
--- a/doc/database/db_photo.md
+++ b/doc/database/db_photo.md
@@ -27,7 +27,7 @@ Fields
 | data          |                                                        | mediumblob         | NO   |     | NULL                |                |
 | scale         |                                                        | tinyint unsigned   | NO   |     | 0                   |                |
 | profile       |                                                        | boolean            | NO   |     | 0                   |                |
-| allow_cid     | Access Control - list of allowed contact.id '<19><78>' | mediumtext         | YES  |     | NULL                |                |
+| allow_cid     | Access Control - list of allowed contact.id '<19><78>' | mediumtext         | YES  |     | NULL                |                |
 | allow_gid     | Access Control - list of allowed groups                | mediumtext         | YES  |     | NULL                |                |
 | deny_cid      | Access Control - list of denied contact.id             | mediumtext         | YES  |     | NULL                |                |
 | deny_gid      | Access Control - list of denied groups                 | mediumtext         | YES  |     | NULL                |                |

diff --git a/view/templates/structure.tpl b/view/templates/structure.tpl
index 954712f12ab5024483fae0ed7705ffdc711642d7..f6a647b791a807f67b8c3e3c976c8f31a834d8f5 100644 (file)
--- a/view/templates/structure.tpl
+++ b/view/templates/structure.tpl
@@ -1,20 +1,20 @@
-Table {{$name}}
+Table {{$name nofilter}}
 ===========
 
-{{$comment}}
+{{$comment nofilter}}
 
 Fields
 ------
 
 {{foreach $fields as $field}}
-| {{$field.name}} | {{$field.comment}} | {{$field.type}} | {{$field.null}} | {{$field.primary}} | {{$field.default}} | {{$field.extra}} |
+| {{$field.name nofilter}} | {{$field.comment nofilter}} | {{$field.type nofilter}} | {{$field.null nofilter}} | {{$field.primary nofilter}} | {{$field.default nofilter}} | {{$field.extra nofilter}} |
 {{/foreach}}
 
 Indexes
 ------------
 
 {{foreach $indexes as $index}}
-| {{$index.name}} | {{$index.fields}} |
+| {{$index.name nofilter}} | {{$index.fields nofilter}} |
 {{/foreach}}
 
 {{if $foreign}}
@@ -24,7 +24,7 @@ Foreign Keys
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
 {{foreach $foreign as $key}}
-| {{$key.field}} | [{{$key.targettable}}](help/database/db_{{$key.targettable}}) | {{$key.targetfield}} |
+| {{$key.field nofilter}} | [{{$key.targettable nofilter}}](help/database/db_{{$key.targettable nofilter}}) | {{$key.targetfield nofilter}} |
 {{/foreach}}
 {{/if}}
 

diff --git a/view/templates/tables.tpl b/view/templates/tables.tpl
index 8fdd12a37b147923d0c73518c1c87cc6e5cdb9bc..2bf38c9f10ca8384fe245324410d6117091efed4 100644 (file)
--- a/view/templates/tables.tpl
+++ b/view/templates/tables.tpl
@@ -6,5 +6,5 @@ Database Tables
 | Table | Description |
 |-------|-------------|
 {{foreach $tables as $table}}
-| [{{$table.name}}](help/database/db_{{$table.name}}) | {{$table.comment}} |
+| [{{$table.name nofilter}}](help/database/db_{{$table.name nofilter}}) | {{$table.comment nofilter}} |
 {{/foreach}}