aboutsummaryrefslogtreecommitdiff
path: root/engine/lib
diff options
context:
space:
mode:
authorBrett Profitt <brett.profitt@gmail.com>2012-12-10 15:50:25 -0500
committerBrett Profitt <brett.profitt@gmail.com>2012-12-10 15:50:25 -0500
commit43a395ae735777bfb5474c4f6a37dc1cd0818a37 (patch)
tree6c156136680474a61cf162d8ef3aceef12cfc7dd /engine/lib
parent4c517db146cb1c59c8a54d9e87b9e5a4ae17987e (diff)
downloadelgg-43a395ae735777bfb5474c4f6a37dc1cd0818a37.tar.gz
elgg-43a395ae735777bfb5474c4f6a37dc1cd0818a37.tar.bz2
Fixes #1479. Added ElggAutoP. Removing [\n\r] from test strings before compare to deal with differing whitespace between tags among PHP versions.
Diffstat (limited to 'engine/lib')
-rw-r--r--engine/lib/output.php11
1 files changed, 6 insertions, 5 deletions
diff --git a/engine/lib/output.php b/engine/lib/output.php
index cce1c7cba..bff0bf6e9 100644
--- a/engine/lib/output.php
+++ b/engine/lib/output.php
@@ -16,7 +16,7 @@
**/
function parse_urls($text) {
// @todo this causes problems with <attr = "val">
- // must be ing <attr="val"> format (no space).
+ // must be in <attr="val"> format (no space).
// By default htmlawed rewrites tags to this format.
// if PHP supported conditional negative lookbehinds we could use this:
// $r = preg_replace_callback('/(?<!=)(?<![ ])?(?<!["\'])((ht|f)tps?:\/\/[^\s\r\n\t<>"\'\!\(\),]+)/i',
@@ -46,6 +46,7 @@ function parse_urls($text) {
*
* @param string $pee The string
* @deprecated Use elgg_autop instead
+ * @todo Add deprecation warning in 1.9
*
* @return string
**/
@@ -56,12 +57,12 @@ function autop($pee) {
/**
* Create paragraphs from text with line spacing
*
- * @param string $pee The string
+ * @param string $string The string
*
* @return string
**/
-function elgg_autop($pee) {
- return ElggAutop::getInstance()->process($pee);
+function elgg_autop($string) {
+ return ElggAutoP::getInstance()->process($string);
}
/**
@@ -358,7 +359,7 @@ function elgg_get_friendly_time($time) {
/**
* Strip tags and offer plugins the chance.
* Plugins register for output:strip_tags plugin hook.
- * Original string included in $params['original_string']
+ * Original string included in $params['original_string']
*
* @param string $string Formatted string
*