jacobemerick / web

utility/content/MarkupCodeContent.class.inc.php

Spacing +4 added lines, -4 removed lines

@@ -10,10 +10,10 @@ 
 	protected function execute($title = '')
 	{
 		preg_match_all(self::$MARKUP_DELIMITER, $this->content, $matches);
-		if(count($matches[1]) == 0)
+		if (count($matches[1]) == 0)
 			return;
 		
-		foreach($matches[3] as $key => $match)
+		foreach ($matches[3] as $key => $match)
 		{
 			$replacement = $match;
 			$replacement = $this->wrap_in_list($replacement);
@@ -29,7 +29,7 @@ 
 	{
 		$content_array = explode("\n", $content);
 		
-		foreach($content_array as $key => $row)
+		foreach ($content_array as $key => $row)
 		{
 			$new_row = ($key % 2 == 0) ? '<li class="even">' : '<li class="odd">';
 			$new_row .= '<p>';
@@ -46,7 +46,7 @@ 
 
 	private function highlight_code($content, $type)
 	{
-		switch($type)
+		switch ($type)
 		{
 			default :
 				return $content;

Braces +3 added lines, -2 removed lines

@@ -10,8 +10,9 @@
 	protected function execute($title = '')
 	{
 		preg_match_all(self::$MARKUP_DELIMITER, $this->content, $matches);
-		if(count($matches[1]) == 0)
-			return;
+		if(count($matches[1]) == 0) {

+					return;

+		}

 		
 		foreach($matches[3] as $key => $match)
 		{

utility/content/FixInternalLinkContent.class.inc.php

Indentation +26 added lines, -26 removed lines

@@ -72,38 +72,38 @@
 				
 				break;
 			case 'falls' :
-                $pieces = explode('/', $uri);
-                if (count($pieces) == 1) {
-                    Loader::load('collector', 'waterfall/WatercourseCollector');
-                    list ($watercourse_alias) = $pieces;
-                    $watercourse = WatercourseCollector::getByAlias($watercourse_alias);
+				$pieces = explode('/', $uri);
+				if (count($pieces) == 1) {
+					Loader::load('collector', 'waterfall/WatercourseCollector');
+					list ($watercourse_alias) = $pieces;
+					$watercourse = WatercourseCollector::getByAlias($watercourse_alias);
                     
-                    if ($watercourse == null) {
-                        return;
-                    }
+					if ($watercourse == null) {
+						return;
+					}
                     
-                    $link .= ($is_absolute) ? Loader::getRootURL('waterfalls') : '/';
-                    $link .= "{$watercourse->alias}/";
+					$link .= ($is_absolute) ? Loader::getRootURL('waterfalls') : '/';
+					$link .= "{$watercourse->alias}/";
                     
-                    if ($anchor == '') {
-                        $anchor = $watercourse->name;
-                    }
-                } else if (count($pieces) == 2) {
-                    Loader::load('collector', 'waterfall/WaterfallCollector');
-                    list ($watercourse_alias, $waterfall_alias) = $pieces;
-                    $waterfall = WaterfallCollector::getByAlias($watercourse_alias, $waterfall_alias);
+					if ($anchor == '') {
+						$anchor = $watercourse->name;
+					}
+				} else if (count($pieces) == 2) {
+					Loader::load('collector', 'waterfall/WaterfallCollector');
+					list ($watercourse_alias, $waterfall_alias) = $pieces;
+					$waterfall = WaterfallCollector::getByAlias($watercourse_alias, $waterfall_alias);
                     
-                    if ($waterfall == null) {
-                        return;
-                    }
+					if ($waterfall == null) {
+						return;
+					}
                     
-                    $link .= ($is_absolute) ? Loader::getRootURL('waterfalls') : '/';
-                    $link .= "{$waterfall->watercourse_alias}/{$waterfall->alias}/";
+					$link .= ($is_absolute) ? Loader::getRootURL('waterfalls') : '/';
+					$link .= "{$waterfall->watercourse_alias}/{$waterfall->alias}/";
                     
-                    if ($anchor == '') {
-                        $anchor = $waterfall->name;
-                    }
-                }
+					if ($anchor == '') {
+						$anchor = $waterfall->name;
+					}
+				}
 				break;
 			default :
 				break;

Spacing +8 added lines, -8 removed lines

@@ -12,9 +12,9 @@ 
 	protected function execute($is_absolute = true)
 	{
 		preg_match_all(self::$LINK_PLACEHOLDER_MATCH, $this->content, $matches);
-		foreach($matches[1] as $key => $match)
+		foreach ($matches[1] as $key => $match)
 		{
-			if(isset($matches[3][$key]))
+			if (isset($matches[3][$key]))
 				$link_content = $this->get_link($match, $is_absolute, $matches[3][$key]);
 			else
 				$link_content = $this->get_link($match, $is_absolute);
@@ -29,19 +29,19 @@ 
 		
 		$link = '';
 		
-		switch($type)
+		switch ($type)
 		{
 			case 'blog' :
 				Loader::load('collector', 'blog/PostCollector');
 				$post = PostCollector::getPostByURI($uri);
 				
-				if($post === NULL)
+				if ($post === NULL)
 					return;
 				
 				$link .= ($is_absolute) ? Loader::getRootURL('blog') : '/';
 				$link .= "{$post->category}/{$post->path}/";
 				
-				if($anchor == '')
+				if ($anchor == '')
 					$anchor = $post->title;
 				
 				break;
@@ -49,7 +49,7 @@ 
 				$link .= ($is_absolute) ? Loader::getRootURL('blog') : '/';
 				$link .= "tag/{$uri}/";
 				
-				if($anchor == '')
+				if ($anchor == '')
 				{
 					$anchor = $uri;
 					$anchor = str_replace('-', ' ', $anchor);
@@ -61,13 +61,13 @@ 
 				Loader::load('collector', 'waterfall/LogCollector');
 				$log = LogCollector::getByAlias($uri);
 				
-				if($log === NULL)
+				if ($log === NULL)
 					return;
 				
 				$link .= ($is_absolute) ? Loader::getRootURL('waterfalls') : '/';
 				$link .= "journal/{$log->alias}/";
 				
-				if($anchor == '')
+				if ($anchor == '')
 					$anchor = $log->title;
 				
 				break;

Braces +17 added lines, -12 removed lines

@@ -14,10 +14,11 @@ 
 		preg_match_all(self::$LINK_PLACEHOLDER_MATCH, $this->content, $matches);
 		foreach($matches[1] as $key => $match)
 		{
-			if(isset($matches[3][$key]))
-				$link_content = $this->get_link($match, $is_absolute, $matches[3][$key]);
-			else
-				$link_content = $this->get_link($match, $is_absolute);
+			if(isset($matches[3][$key])) {

+							$link_content = $this->get_link($match, $is_absolute, $matches[3][$key]);

+			} else {

+							$link_content = $this->get_link($match, $is_absolute);

+			}

 			$this->content = str_replace($matches[0][$key], $link_content, $this->content);
 		}
 		return;
@@ -35,14 +36,16 @@ 
 				Loader::load('collector', 'blog/PostCollector');
 				$post = PostCollector::getPostByURI($uri);
 				
-				if($post === NULL)
-					return;
+				if($post === NULL) {

+									return;

+				}

 				
 				$link .= ($is_absolute) ? Loader::getRootURL('blog') : '/';
 				$link .= "{$post->category}/{$post->path}/";
 				
-				if($anchor == '')
-					$anchor = $post->title;
+				if($anchor == '') {

+									$anchor = $post->title;

+				}

 				
 				break;
 			case 'blog-tag' :
@@ -61,14 +64,16 @@ 
 				Loader::load('collector', 'waterfall/LogCollector');
 				$log = LogCollector::getByAlias($uri);
 				
-				if($log === NULL)
-					return;
+				if($log === NULL) {

+									return;

+				}

 				
 				$link .= ($is_absolute) ? Loader::getRootURL('waterfalls') : '/';
 				$link .= "journal/{$log->alias}/";
 				
-				if($anchor == '')
-					$anchor = $log->title;
+				if($anchor == '') {

+									$anchor = $log->title;

+				}

 				
 				break;
 			case 'falls' :

utility/content/AcceptableContent.class.inc.php

Spacing +3 added lines, -3 removed lines

@@ -9,9 +9,9 @@ 
 	protected function execute()
 	{
 		$is_acceptable = true;
-		foreach($this->getUnacceptableWords() as $unacceptableWord)
+		foreach ($this->getUnacceptableWords() as $unacceptableWord)
 		{
-			if(stristr($unacceptableWord->word, $this->content))
+			if (stristr($unacceptableWord->word, $this->content))
 				$is_acceptable = false;
 		}
 		return $is_acceptable;
@@ -20,7 +20,7 @@ 
 	private $unacceptableWords;
 	private function getUnacceptableWords()
 	{
-		if(!$this->unacceptableWords)
+		if (!$this->unacceptableWords)
 			$this->unacceptableWords = UnacceptableWordCollector::getWords();
 		return $this->unacceptableWords;
 	}

Braces +6 added lines, -4 removed lines

@@ -11,8 +11,9 @@ 
 		$is_acceptable = true;
 		foreach($this->getUnacceptableWords() as $unacceptableWord)
 		{
-			if(stristr($unacceptableWord->word, $this->content))
-				$is_acceptable = false;
+			if(stristr($unacceptableWord->word, $this->content)) {

+							$is_acceptable = false;

+			}

 		}
 		return $is_acceptable;
 	}
@@ -20,8 +21,9 @@ 
 	private $unacceptableWords;
 	private function getUnacceptableWords()
 	{
-		if(!$this->unacceptableWords)
-			$this->unacceptableWords = UnacceptableWordCollector::getWords();
+		if(!$this->unacceptableWords) {

+					$this->unacceptableWords = UnacceptableWordCollector::getWords();

+		}

 		return $this->unacceptableWords;
 	}
 

utility/content/ImperialUnitContent.class.inc.php

Indentation +46 added lines, -46 removed lines

@@ -5,56 +5,56 @@
 final class ImperialUnitContent extends Content
 {
 
-    protected function execute($type = '')
-    {
-        $number = floatval($this->content);
-        $number *= 39.37; // convert to inches
+	protected function execute($type = '')
+	{
+		$number = floatval($this->content);
+		$number *= 39.37; // convert to inches
         
-        if ($type == '') {
-            if ($number > (12 * 3 * 1760 * 5)) {
-                $type = 'full miles';
-            } else if ($number > (12 * 3 * 1760 * .5)) {
-                $type = 'tenth miles';
-            } else if ($number > (12 * 3 * 150)) {
-                $type = 'yards';
-            } else if ($number > (12 * 10)) {
-                $type = 'feet';
-            } else {
-                $type = 'inches';
-            }
-        }
+		if ($type == '') {
+			if ($number > (12 * 3 * 1760 * 5)) {
+				$type = 'full miles';
+			} else if ($number > (12 * 3 * 1760 * .5)) {
+				$type = 'tenth miles';
+			} else if ($number > (12 * 3 * 150)) {
+				$type = 'yards';
+			} else if ($number > (12 * 10)) {
+				$type = 'feet';
+			} else {
+				$type = 'inches';
+			}
+		}
         
-        switch ($type) {
-            case 'full miles' :
-                $this->content = number_format(round($number / (12 * 3 * 1760))) . ' miles';
-                break;
-            case 'tenth miles' :
-                $this->content = round($number / (12 * 3 * 1760), 1) . ' miles';
-                break;
-            case 'yards' :
-                $this->content = number_format(round($number / (12 * 3))) . ' yards';
-                break;
-            case 'feet' :
-                $this->content = number_format(round($number / 12)) . "'";
-                break;
-            case 'inches' :
-                $feet = floor($number / 12);
+		switch ($type) {
+			case 'full miles' :
+				$this->content = number_format(round($number / (12 * 3 * 1760))) . ' miles';
+				break;
+			case 'tenth miles' :
+				$this->content = round($number / (12 * 3 * 1760), 1) . ' miles';
+				break;
+			case 'yards' :
+				$this->content = number_format(round($number / (12 * 3))) . ' yards';
+				break;
+			case 'feet' :
+				$this->content = number_format(round($number / 12)) . "'";
+				break;
+			case 'inches' :
+				$feet = floor($number / 12);
                 
-                $inches = $number - $feet * 12;
-                $inches = round($inches);
+				$inches = $number - $feet * 12;
+				$inches = round($inches);
                 
-                if ($inches == 12) {
-                    $feet++;
-                    $inches = 0;
-                }
+				if ($inches == 12) {
+					$feet++;
+					$inches = 0;
+				}
                 
-                $this->content = '';
-                $this->content .= number_format($feet) . "'";
-                if (isset($inches) && $inches > 0) {
-                    $this->content .= " {$inches}\"";
-                }
-                break;
-        }
-    }
+				$this->content = '';
+				$this->content .= number_format($feet) . "'";
+				if (isset($inches) && $inches > 0) {
+					$this->content .= " {$inches}\"";
+				}
+				break;
+		}
+	}
 
 }
\ No newline at end of file

utility/content/FixImageContent.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 	protected function execute($is_absolute = false)
 	{
 		preg_match_all(self::$IMAGE_PLACEHOLDER_MATCH, $this->content, $matches);
-		foreach($matches[1] as $key => $match)
+		foreach ($matches[1] as $key => $match)
 		{
 			$image_path = $this->get_file_path($match);
 			$this->content = str_replace($matches[0][$key], $image_path, $this->content);

utility/content/SmartTrimContent.class.inc.php

Indentation +2 added lines, -2 removed lines

@@ -42,8 +42,8 @@
 		
 		if($length < strlen($this->content))
 			$this->trim_string($length);
-        else
-            $etc = '';
+		else
+			$etc = '';
 		$this->check_exclude_tags();
 		$this->close_tags($etc);
 	}

Spacing +13 added lines, -13 removed lines

@@ -27,20 +27,20 @@ 
 	protected function execute()
 	{
 		$args = func_get_args();
-		if(count($args) < 1)
+		if (count($args) < 1)
 		{
 			trigger_error('Someone called SmartTrimContent w/o defining a length... bad!');
 			return;
 		}
 		
-		if(count($args) == 2)
+		if (count($args) == 2)
 			$etc = $args[1];
 		else
 			$etc = self::$ETC;
 		
 		$length = $args[0];
 		
-		if($length < strlen($this->content))
+		if ($length < strlen($this->content))
 			$this->trim_string($length);
         else
             $etc = '';
@@ -54,7 +54,7 @@ 
 		
 		$last_right_bracket_position = strripos($content, self::$RIGHT_BRACKET);
 		$last_left_bracket_position = strripos($content, self::$LEFT_BRACKET);
-		if($last_left_bracket_position > $last_right_bracket_position)
+		if ($last_left_bracket_position > $last_right_bracket_position)
 			$content = substr($content, 0, $last_left_bracket_position);
 		$content = trim($content);
 		
@@ -73,16 +73,16 @@ 
 		$content = current($content);
 		
 		$max_length = $length;
-		foreach($matches[0] as $match)
+		foreach ($matches[0] as $match)
 		{
 			$max_length += strlen($match[0]);
-			if($max_length <= $match[1])
+			if ($max_length <= $match[1])
 				break;
 			
 			$content = substr($content, 0, $match[1]) . $match[0] . substr($content, $match[1]);
 		}
 		
-		if(substr($content, -7) == '</p><p>')
+		if (substr($content, -7) == '</p><p>')
 			$content = substr($content, 0, -7);
 		
 		return $content;
@@ -94,7 +94,7 @@ 
 		$tags_preg = $this->get_tags_preg(self::$EXCLUDE_TAGS);
 		preg_match_all($tags_preg, $content, $matches, PREG_OFFSET_CAPTURE);
 		
-		if(count($matches[1]) % 2 == 1)
+		if (count($matches[1]) % 2 == 1)
 		{
 			$cut_tag = end($matches[1]);
 			$cut_tag_position = $cut_tag[1] - 1;
@@ -112,9 +112,9 @@ 
 		preg_match_all($tags_preg, $content, $matches);
 		$open_tags = array();
 		
-		foreach($matches[1] as $tag)
+		foreach ($matches[1] as $tag)
 		{
-			if(in_array($tag, $open_tags))
+			if (in_array($tag, $open_tags))
 			{
 				$key = array_search($tag, $open_tags);
 				unset($open_tags[$key]);
@@ -124,11 +124,11 @@ 
 		}
 		
 		$open_tags = array_reverse($open_tags);
-		if(count($open_tags) > 0)
+		if (count($open_tags) > 0)
 		{
-			foreach($open_tags as $key => $open_tag)
+			foreach ($open_tags as $key => $open_tag)
 			{
-				if($key == count($open_tags) - 1)
+				if ($key == count($open_tags) - 1)
 					$content .= $etc;
 				$content .= "</{$open_tag}>";
 			}

Braces +28 added lines, -22 removed lines

@@ -33,17 +33,19 @@ 
 			return;
 		}
 		
-		if(count($args) == 2)
-			$etc = $args[1];
-		else
-			$etc = self::$ETC;
+		if(count($args) == 2) {

+					$etc = $args[1];

+		} else {

+					$etc = self::$ETC;

+		}

 		
 		$length = $args[0];
 		
-		if($length < strlen($this->content))
-			$this->trim_string($length);
-        else
-            $etc = '';
+		if($length < strlen($this->content)) {

+					$this->trim_string($length);

+		} else {

+                    $etc = '';

+        }

 		$this->check_exclude_tags();
 		$this->close_tags($etc);
 	}
@@ -54,8 +56,9 @@ 
 		
 		$last_right_bracket_position = strripos($content, self::$RIGHT_BRACKET);
 		$last_left_bracket_position = strripos($content, self::$LEFT_BRACKET);
-		if($last_left_bracket_position > $last_right_bracket_position)
-			$content = substr($content, 0, $last_left_bracket_position);
+		if($last_left_bracket_position > $last_right_bracket_position) {

+					$content = substr($content, 0, $last_left_bracket_position);

+		}

 		$content = trim($content);
 		
 		$this->content = $content;
@@ -76,14 +79,16 @@ 
 		foreach($matches[0] as $match)
 		{
 			$max_length += strlen($match[0]);
-			if($max_length <= $match[1])
-				break;
+			if($max_length <= $match[1]) {

+							break;

+			}

 			
 			$content = substr($content, 0, $match[1]) . $match[0] . substr($content, $match[1]);
 		}
 		
-		if(substr($content, -7) == '</p><p>')
-			$content = substr($content, 0, -7);
+		if(substr($content, -7) == '</p><p>') {

+					$content = substr($content, 0, -7);

+		}

 		
 		return $content;
 	}
@@ -118,9 +123,9 @@ 
 			{
 				$key = array_search($tag, $open_tags);
 				unset($open_tags[$key]);
-			}
-			else
-				$open_tags[] = $tag;
+			} else {

+							$open_tags[] = $tag;

+			}

 		}
 		
 		$open_tags = array_reverse($open_tags);
@@ -128,13 +133,14 @@ 
 		{
 			foreach($open_tags as $key => $open_tag)
 			{
-				if($key == count($open_tags) - 1)
-					$content .= $etc;
+				if($key == count($open_tags) - 1) {

+									$content .= $etc;

+				}

 				$content .= "</{$open_tag}>";
 			}
-		}
-		else
-			$content .= $etc;
+		} else {

+					$content .= $etc;

+		}

 		
 		$this->content = $content;
 	}

utility/content/FixUnacceptableCharacterContent.class.inc.php

Spacing +2 added lines, -2 removed lines

@@ -11,9 +11,9 @@
 
 	protected function execute()
 	{
-		foreach(self::$UNACCEPTABLE_CHARACTER_ARRAY as $match => $replace)
+		foreach (self::$UNACCEPTABLE_CHARACTER_ARRAY as $match => $replace)
 		{
-			if(stristr($this->content, $match))
+			if (stristr($this->content, $match))
 				$this->content = str_replace($match, $replace, $this->content);
 		}
 		return;

Braces +3 added lines, -2 removed lines

@@ -13,8 +13,9 @@
 	{
 		foreach(self::$UNACCEPTABLE_CHARACTER_ARRAY as $match => $replace)
 		{
-			if(stristr($this->content, $match))
-				$this->content = str_replace($match, $replace, $this->content);
+			if(stristr($this->content, $match)) {

+							$this->content = str_replace($match, $replace, $this->content);

+			}

 		}
 		return;
 	}

utility/content/AutolinkTwitterURLContent.class.inc.php

Spacing +11 added lines, -11 removed lines

@@ -10,11 +10,11 @@ 
 
 	protected function execute()
 	{
-		if(stristr($this->content, 'http') === false)
+		if (stristr($this->content, 'http') === false)
 			return;
 		
 		$parameters = func_get_args();
-		if(count($parameters) > 1 || (count($parameters) == 1 && !is_array($parameters[0])))
+		if (count($parameters) > 1 || (count($parameters) == 1 && !is_array($parameters[0])))
 		{
 			trigger_error('Unexpected parameters passed into AutolinkTwitterURL!');
 			return;
@@ -22,10 +22,10 @@ 
 		$parameters = array_shift($parameters);
 		
 		$found_link = preg_match_all(self::$LINK_PATTERN, $this->content, $matches, PREG_SET_ORDER);
-		if($found_link === false || $found_link === 0)
+		if ($found_link === false || $found_link === 0)
 			return;
 		
-		foreach($matches as $match)
+		foreach ($matches as $match)
 		{
 			$parameters['href'] = $match[0];
 			$display_url = $this->get_display_url($match);
@@ -41,7 +41,7 @@ 
 	{
 		$display_url = $this->check_for_redirect($match[0]);
 		
-		if(strlen($display_url) > (self::$DISPLAY_URL_LENGTH - 2))
+		if (strlen($display_url) > (self::$DISPLAY_URL_LENGTH - 2))
 		{
 			$display_url = substr($display_url, 0, self::$DISPLAY_URL_LENGTH);
 			$display_url .= '...';
@@ -53,12 +53,12 @@ 
 	private function get_replacement_link($parameters, $display_url)
 	{
 		$link = '<a';
-		foreach($parameters as $attribute => $value)
+		foreach ($parameters as $attribute => $value)
 		{
 			$link .= ' ';
 			$link .= $attribute;
 			$link .= '=';
-			$link .= '"' . $value .'"';
+			$link .= '"' . $value . '"';
 		}
 		$link .= '>';
 		$link .= $display_url;
@@ -70,14 +70,14 @@ 
 	private function check_for_redirect($url)
 	{
 		$headers = @get_headers($url);
-		if($headers === false)
+		if ($headers === false)
 			$headers = $this->get_headers($url);
 		
-		if(stristr($headers[0], '301') !== false || stristr($headers[0], '302') !== false)
+		if (stristr($headers[0], '301') !== false || stristr($headers[0], '302') !== false)
 		{
-			foreach($headers as $header)
+			foreach ($headers as $header)
 			{
-				if(substr($header, 0, 9) == 'Location:')
+				if (substr($header, 0, 9) == 'Location:')
 					break;
 			}
 			

Braces +12 added lines, -8 removed lines

@@ -10,8 +10,9 @@ 
 
 	protected function execute()
 	{
-		if(stristr($this->content, 'http') === false)
-			return;
+		if(stristr($this->content, 'http') === false) {

+					return;

+		}

 		
 		$parameters = func_get_args();
 		if(count($parameters) > 1 || (count($parameters) == 1 && !is_array($parameters[0])))
@@ -22,8 +23,9 @@ 
 		$parameters = array_shift($parameters);
 		
 		$found_link = preg_match_all(self::$LINK_PATTERN, $this->content, $matches, PREG_SET_ORDER);
-		if($found_link === false || $found_link === 0)
-			return;
+		if($found_link === false || $found_link === 0) {

+					return;

+		}

 		
 		foreach($matches as $match)
 		{
@@ -70,15 +72,17 @@ 
 	private function check_for_redirect($url)
 	{
 		$headers = @get_headers($url);
-		if($headers === false)
-			$headers = $this->get_headers($url);
+		if($headers === false) {

+					$headers = $this->get_headers($url);

+		}

 		
 		if(stristr($headers[0], '301') !== false || stristr($headers[0], '302') !== false)
 		{
 			foreach($headers as $header)
 			{
-				if(substr($header, 0, 9) == 'Location:')
-					break;
+				if(substr($header, 0, 9) == 'Location:') {

+									break;

+				}

 			}
 			
 			$url = substr($header, 10);

utility/content/AutolinkTwitterHashContent.class.inc.php

Spacing +4 added lines, -4 removed lines

@@ -10,12 +10,12 @@ 
 
 	protected function execute()
 	{
-		if(stristr($this->content, '#') === false)
+		if (stristr($this->content, '#') === false)
 			return;
 		
 		// yeah yeah, i'm currently ignoring the link, whatevs
 		$parameters = func_get_args();
-		if(count($parameters) > 1 || (count($parameters) == 1 && !is_array($parameters[0])))
+		if (count($parameters) > 1 || (count($parameters) == 1 && !is_array($parameters[0])))
 		{
 			trigger_error('Unexpected parameters passed into AutolinkTwitterHash!');
 			return;
@@ -23,10 +23,10 @@ 
 		$parameters = array_shift($parameters);
 		
 		$found_hash = preg_match_all(self::$HASH_PATTERN, $this->content, $matches, PREG_SET_ORDER);
-		if($found_hash === false || $found_hash === 0)
+		if ($found_hash === false || $found_hash === 0)
 			return;
 		
-		foreach($matches as $match)
+		foreach ($matches as $match)
 		{
 			$replacement = $this->get_replacement_link($match[1], $match[0]);
 			$this->content = str_replace($match[0], $replacement, $this->content);

Braces +6 added lines, -4 removed lines

@@ -10,8 +10,9 @@ 
 
 	protected function execute()
 	{
-		if(stristr($this->content, '#') === false)
-			return;
+		if(stristr($this->content, '#') === false) {

+					return;

+		}

 		
 		// yeah yeah, i'm currently ignoring the link, whatevs
 		$parameters = func_get_args();
@@ -23,8 +24,9 @@ 
 		$parameters = array_shift($parameters);
 		
 		$found_hash = preg_match_all(self::$HASH_PATTERN, $this->content, $matches, PREG_SET_ORDER);
-		if($found_hash === false || $found_hash === 0)
-			return;
+		if($found_hash === false || $found_hash === 0) {

+					return;

+		}

 		
 		foreach($matches as $match)
 		{