From e1f88fd15d75f81af5017860b9f197771326c9b7 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 16 Oct 2014 02:02:11 -0700
Subject: jsonp support (thankxs fabrixxm)

---
 include/api.php      | 5 ++++-
 include/taxonomy.php | 2 +-
 version.inc          | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/include/api.php b/include/api.php
index 2505def4c..8b52253dd 100644
--- a/include/api.php
+++ b/include/api.php
@@ -197,7 +197,10 @@ require_once('include/items.php');
 					case "json":
 						header ("Content-Type: application/json");
 						foreach($r as $rr)
-						    return json_encode($rr);
+							$json = json_encode($rr);
+						if ($_GET['callback'])
+							$json = $_GET['callback']."(".$json.")";
+						return $json; 
 						break;
 					case "rss":
 						header ("Content-Type: application/rss+xml");
diff --git a/include/taxonomy.php b/include/taxonomy.php
index 92003328f..35605da22 100644
--- a/include/taxonomy.php
+++ b/include/taxonomy.php
@@ -154,7 +154,7 @@ function tagadelic($uid, $count = 0, $authors = '', $flags = 0, $restrict = 0, $
 }
 
 function tags_sort($a,$b) {
-   if($a[0] == $b[0])
+   if(strtolower($a[0]) == strtolower($b[0]))
 	 return 0;
    return((strtolower($a[0]) < strtolower($b[0])) ? -1 : 1);
 }
diff --git a/version.inc b/version.inc
index ccf12f9fc..ab083bbd8 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-10-15.829
+2014-10-16.830
-- 
cgit v1.2.3