summaryrefslogtreecommitdiff
path: root/lib/util.php
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-11-29 15:04:21 -0800
committerBrion Vibber <brion@pobox.com>2010-11-29 15:07:55 -0800
commit82799f675f2afa067ecb46e829d9b93b79b773b2 (patch)
tree6e0e974cd2a7245f7a0027b0ae708f8e2435caa7 /lib/util.php
parentfffc10a23084f1bb4b47de926dc1034c8f9ee9b8 (diff)
Add Nickname test cases for @-reply regexes in common_find_mentions
Diffstat (limited to 'lib/util.php')
-rw-r--r--lib/util.php47
1 files changed, 36 insertions, 11 deletions
diff --git a/lib/util.php b/lib/util.php
index c170c8380..317a7aa42 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -564,6 +564,16 @@ function common_render_content($text, $notice)
return $r;
}
+/**
+ * Finds @-mentions within the partially-rendered text section and
+ * turns them into live links.
+ *
+ * Should generally not be called except from common_render_content().
+ *
+ * @param string $text partially-rendered HTML
+ * @param Notice $notice in-progress or complete Notice object for context
+ * @return string partially-rendered HTML
+ */
function common_linkify_mentions($text, $notice)
{
$mentions = common_find_mentions($text, $notice);
@@ -669,17 +679,7 @@ function common_find_mentions($text, $notice)
}
}
- preg_match_all('/^T (' . Nickname::DISPLAY_FMT . ') /',
- $text,
- $tmatches,
- PREG_OFFSET_CAPTURE);
-
- preg_match_all('/(?:^|\s+)@(' . Nickname::DISPLAY_FMT . ')\b/',
- $text,
- $atmatches,
- PREG_OFFSET_CAPTURE);
-
- $matches = array_merge($tmatches[1], $atmatches[1]);
+ $matches = common_find_mentions_raw($text);
foreach ($matches as $match) {
try {
@@ -753,6 +753,31 @@ function common_find_mentions($text, $notice)
return $mentions;
}
+/**
+ * Does the actual regex pulls to find @-mentions in text.
+ * Should generally not be called directly; for use in common_find_mentions.
+ *
+ * @param string $text
+ * @return array of PCRE match arrays
+ */
+function common_find_mentions_raw($text)
+{
+ $tmatches = array();
+ preg_match_all('/^T (' . Nickname::DISPLAY_FMT . ') /',
+ $text,
+ $tmatches,
+ PREG_OFFSET_CAPTURE);
+
+ $atmatches = array();
+ preg_match_all('/(?:^|\s+)@(' . Nickname::DISPLAY_FMT . ')\b/',
+ $text,
+ $atmatches,
+ PREG_OFFSET_CAPTURE);
+
+ $matches = array_merge($tmatches[1], $atmatches[1]);
+ return $matches;
+}
+
function common_render_text($text)
{
$r = htmlspecialchars($text);