cleaner error handling

nick5a1 · May 21, 2012 · 0aceba8 · 0aceba8
1 parent 0ed01cb
commit 0aceba8
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/social/service/twitter.php b/lib/social/service/twitter.php
@@ -353,6 +353,9 @@ public function aggregation_row($type, $item, $username, $id) {
 	 * @return string
 	 */
 	public function tweet_url_to_id($url) {
+		if (substr($url, 0, 4) != 'http' || strpos($url, '/') === false) {
+			return '';
+		}
 		$url = explode('/', $url);
 		return end($url);
 	}
@@ -375,10 +378,7 @@ public function import_tweet_by_url($post_id, $url) {
 		$invalid = false;
 		$id = $this->tweet_url_to_id($url);
 		if (!empty($id) and !$this->is_original_broadcast($post, $id)) {
-			Social::log('Importing tweet. -- ID: :id -- URL: :url', array(
-				'id' => $id,
-				'url' => implode('/', $url)
-			));
+			Social::log('Importing tweet. -- ID: :id -- URL: :url');
 			$url = 'http://api.twitter.com/1/statuses/show.json?id='.$id;
 			$request = wp_remote_get($url);
 			if (!is_wp_error($request)) {