aboutsummaryrefslogtreecommitdiffhomepage
path: root/application
diff options
context:
space:
mode:
authorVirtualTam <virtualtam@flibidi.net>2015-12-23 19:50:33 +0100
committerVirtualTam <virtualtam@flibidi.net>2015-12-23 19:50:33 +0100
commitccb7cf9855a1842fbba4e48f05dad906402d4ca1 (patch)
tree70178dfe49f908d4992dbcd39ee8d498b7ef61f8 /application
parent70a35e2a6dfeabcb657494a0f30eb630aeb57792 (diff)
parent49e62f22ad750d4d60936ec8437caee91809b179 (diff)
downloadShaarli-ccb7cf9855a1842fbba4e48f05dad906402d4ca1.tar.gz
Shaarli-ccb7cf9855a1842fbba4e48f05dad906402d4ca1.tar.zst
Shaarli-ccb7cf9855a1842fbba4e48f05dad906402d4ca1.zip
Merge pull request #418 from ArthurHoaro/qrcode-bug
QRCode plugin: use url instead of real_url
Diffstat (limited to 'application')
-rw-r--r--application/LinkDB.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/application/LinkDB.php b/application/LinkDB.php
index f771ac8b..51fa926d 100644
--- a/application/LinkDB.php
+++ b/application/LinkDB.php
@@ -17,8 +17,10 @@
17 * - private: Is this link private? 0=no, other value=yes 17 * - private: Is this link private? 0=no, other value=yes
18 * - tags: tags attached to this entry (separated by spaces) 18 * - tags: tags attached to this entry (separated by spaces)
19 * - title Title of the link 19 * - title Title of the link
20 * - url URL of the link. Can be absolute or relative. 20 * - url URL of the link. Used for displayable links (no redirector, relative, etc.).
21 * Can be absolute or relative.
21 * Relative URLs are permalinks (e.g.'?m-ukcw') 22 * Relative URLs are permalinks (e.g.'?m-ukcw')
23 * - real_url Absolute processed URL.
22 * 24 *
23 * Implements 3 interfaces: 25 * Implements 3 interfaces:
24 * - ArrayAccess: behaves like an associative array; 26 * - ArrayAccess: behaves like an associative array;