aboutsummaryrefslogtreecommitdiffstats
path: root/include/text.php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-05-05 16:58:46 -0700
committerzotlabs <mike@macgirvin.com>2017-05-05 16:58:46 -0700
commitf840082aaead8356a5787109f0c67179ecdf7993 (patch)
tree05fcb73fae9412706a04a44a3188a187375d3ca4 /include/text.php
parent47ebddf99f5487cbcdfbabaa367c7b09fa0a86e3 (diff)
parent3ccefa20e8b10d0a507c6b002237664e721ca389 (diff)
downloadvolse-hubzilla-f840082aaead8356a5787109f0c67179ecdf7993.tar.gz
volse-hubzilla-f840082aaead8356a5787109f0c67179ecdf7993.tar.bz2
volse-hubzilla-f840082aaead8356a5787109f0c67179ecdf7993.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'include/text.php')
-rw-r--r--include/text.php15
1 files changed, 7 insertions, 8 deletions
diff --git a/include/text.php b/include/text.php
index e769d0c79..dc01f97bd 100644
--- a/include/text.php
+++ b/include/text.php
@@ -774,9 +774,9 @@ function activity_match($haystack,$needle) {
}
/**
- * @brief Pull out all #hashtags and @person tags from $s.
+ * @brief Pull out all \#hashtags and \@person tags from $s.
*
- * We also get @person@domain.com - which would make
+ * We also get \@person\@domain.com - which would make
* the regex quite complicated as tags can also
* end a sentence. So we'll run through our results
* and strip the period from any tags which end with one.
@@ -2114,7 +2114,7 @@ function ids_to_querystr($arr,$idx = 'id',$quote = false) {
* If $abook is true also include the abook info. This is needed in the API to
* save extra per item lookups there.
*
- * @param array[in,out] &$items
+ * @param[in,out] array &$items
* @param boolean $abook If true also include the abook info
* @param number $effective_uid
*/
@@ -2210,10 +2210,10 @@ function magic_link($s) {
}
/**
- * if $escape is true, dbesc() each element before adding quotes
+ * @brief If $escape is true, dbesc() each element before adding quotes.
*
- * @param array[in,out] &$arr
- * @param boolean $escape default false
+ * @param[in,out] array &$arr
+ * @param boolean $escape (optional) default false
*/
function stringify_array_elms(&$arr, $escape = false) {
for($x = 0; $x < count($arr); $x ++)
@@ -2224,7 +2224,6 @@ function stringify_array_elms(&$arr, $escape = false) {
* @brief Indents a flat JSON string to make it more human-readable.
*
* @param string $json The original JSON string to process.
- *
* @return string Indented version of the original JSON string.
*/
function jindent($json) {
@@ -3175,4 +3174,4 @@ function ellipsify($s,$maxlen) {
return $s;
return mb_substr($s,0,$maxlen / 2) . '...' . mb_substr($s,mb_strlen($s) - ($maxlen / 2));
-}
+}