aboutsummaryrefslogtreecommitdiffstats
path: root/doc/html/text_8php.js
diff options
context:
space:
mode:
authormarijus <mario@localhost.localdomain>2014-02-07 13:50:18 +0100
committermarijus <mario@localhost.localdomain>2014-02-07 13:50:18 +0100
commit6dd05bb53fb7892a386740f6ee246649f6f70e1e (patch)
treecb959c7969402bcc3a70acfb5088ec34f43402f5 /doc/html/text_8php.js
parent6f2c168d1a434b2223f09a922780617fdc07b278 (diff)
parentc80325b4279b6f19540416064382755ca5e6eccd (diff)
downloadvolse-hubzilla-6dd05bb53fb7892a386740f6ee246649f6f70e1e.tar.gz
volse-hubzilla-6dd05bb53fb7892a386740f6ee246649f6f70e1e.tar.bz2
volse-hubzilla-6dd05bb53fb7892a386740f6ee246649f6f70e1e.zip
Merge branch 'master' of https://github.com/friendica/red into upstream
Diffstat (limited to 'doc/html/text_8php.js')
-rw-r--r--doc/html/text_8php.js5
1 files changed, 2 insertions, 3 deletions
diff --git a/doc/html/text_8php.js b/doc/html/text_8php.js
index c3be5dc91..be6fbeab3 100644
--- a/doc/html/text_8php.js
+++ b/doc/html/text_8php.js
@@ -25,7 +25,6 @@ var text_8php =
[ "fix_mce_lf", "text_8php.html#afdc69fe3f6c09e35e46304dcea63ae28", null ],
[ "format_categories", "text_8php.html#a3054189cff173977f4216c9a3dd29e1b", null ],
[ "format_filer", "text_8php.html#a4e4d42b0a805148d9f9a92bcac89bf91", null ],
- [ "generate_user_guid", "text_8php.html#ae4f6881d7e13623f8eded6277595112a", null ],
[ "get_mentions", "text_8php.html#a76d1b3435c067978d7b484c45f56472b", null ],
[ "get_mood_verbs", "text_8php.html#a736db13a966b8abaf8c9198faa35911a", null ],
[ "get_plink", "text_8php.html#aac0969ae09853205992ba06ab9f9f61a", null ],
@@ -51,7 +50,6 @@ var text_8php =
[ "micropro", "text_8php.html#a2a902f5fdba8646333e997898ac45ea3", null ],
[ "mimetype_select", "text_8php.html#a1633412120f52bdce5f43e0a127d9293", null ],
[ "normalise_link", "text_8php.html#a4bbb7d00c05cd20b4e043424f322388f", null ],
- [ "normalise_openid", "text_8php.html#adba17ec946f4285285dc100f7860bf51", null ],
[ "notags", "text_8php.html#a1af49756c8c71902a66c7e329c462beb", null ],
[ "paginate", "text_8php.html#afe9f178d264d44a94dc1292aaf0fd585", null ],
[ "perms2str", "text_8php.html#a98fd99dee3da8cf4c148dc04efe782ee", null ],
@@ -70,7 +68,8 @@ var text_8php =
[ "sanitise_acl", "text_8php.html#a9fbeae13c9abd6e27cb4d8d1817f969c", null ],
[ "search", "text_8php.html#a876e94892867019935b348b573299352", null ],
[ "searchbox", "text_8php.html#aae91e4d2a2c6f7a9daccd2c186ae3447", null ],
- [ "smile_encode", "text_8php.html#a44d460fcdee6247c67b9bef3ea15f3e6", null ],
+ [ "smile_shield", "text_8php.html#a10dde167249ed5abf190a7a0986878ea", null ],
+ [ "smile_unshield", "text_8php.html#a273156a6f5cddc6652ad656821cd5805", null ],
[ "smilies", "text_8php.html#a3d225b253bb9e0f2498c11647d927b0b", null ],
[ "sslify", "text_8php.html#a33bdb5d4bfff2ede7caf61a98ac0a2e9", null ],
[ "stringify_array_elms", "text_8php.html#a8796f6a9ca592ecdce7b3afc3462aa13", null ],