fix SQL error if id is the sort type
#611
Merge remote-tracking branch 'origin/master' into 1.4.6

Conflicts:
	zp-core/Zenphoto.package

	modified:   zp-core/Zenphoto.package
	modified:   zp-core/admin-functions.php
	modified:   zp-core/zp-extensions/GoogleMap.php
	modified:   zp-core/zp-extensions/GoogleMap/Map.php
	modified:   zp-core/zp-extensions/image_album_statistics.php
	modified:   zp-core/zp-extensions/menu_manager/menu_manager-admin-functions.php