There is no need to left join. All users that did tweet something do need an belonging entry in
the tweetusers table.
this will also utilies the index on the attribute time on table tweets (because of LIMIT 25)
use an INNER JOIN and use 'BETWEEN x and y' for attribute time to utilise the index "tweets_x1"
ignoring inc/config.php
Location plugin: displays a Google Maps map next to Tweets which have location data attached to them. Be sure to define your Google Maps API key in order to use this plugin
(cherry picked from commit 171e84f5ad05cc094c718f04d2f9c63ff36c02b3)
- Changed to "hybrid" map
- Explicit zoom-level
- Corrected google-maps-link
- Skip 0,0 locations (somehow twitter does seem to like them once in a while)(cherry picked from commit 719c388f84315bc8ef892a8e876d63f0abdacf83)
using the new google maps api that doesn't need a key
flic.kr in the image extension

Conflicts:
	extensions/images.php
emojis, using php-emoji by @iamcal https://github.com/iamcal/php-emoji

Conflicts:
	inc/html.php
removed longurl.org dependence, curl ftw

Conflicts:
	extensions/images.php
Added Pict.Mobi Support

Conflicts:
	extensions/images.php
Adds support for instagr.am

Includes changes suggested by @cdn
Remove logging for loadtweet

Conflicts:
	maintenance/loadtweets.php
Adios awesome if cascade!

Welcome switch for simply merge (we merge only line by line for the services host)

Conflicts:
	extensions/images.php
Add support for MySQL ports
load external JavaScript via HTTPS

Loading active content over insecure connections compromises
sites loaded over HTTPS, as the JS may be altered in-flight
to do everything the attacker wants. Newer versions of Chrome
default to not loading such components.

Conflicts:
	inc/header.php
always link to Twitter and Google Maps with https://

This helps prevent users from accidentally using an insecure connection.

Conflicts:
	inc/html.php
Initial output-only entity parsing
Required change to enable extensions to parse Tweet Entities

Conflicts:
	maintenance/loadtweets.php
Tweet pre-processing to substitute the pre-t.co link originally referenced
Select most recent tweet based on time rather than id

Conflicts:
	maintenance/loadtweets.php