Merge pull request #3568 from tobiasd/20170707-esde

[friendica.git] / include / photos.php

diff --git a/include/photos.php b/include/photos.php
index e872532a481ae78dd882f5532c6fb36a8fb77c6f..6e0002bd472405b858fd7e3e16c75c409abcc295 100644 (file)
--- a/include/photos.php
+++ b/include/photos.php
@@ -4,15 +4,15 @@
  * @brief Functions related to photo handling.
  */
 
-use \Friendica\Core\Config;
-use \Friendica\Core\PConfig;
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
 
 function getGps($exifCoord, $hemi) {
        $degrees = count($exifCoord) > 0 ? gps2Num($exifCoord[0]) : 0;
        $minutes = count($exifCoord) > 1 ? gps2Num($exifCoord[1]) : 0;
        $seconds = count($exifCoord) > 2 ? gps2Num($exifCoord[2]) : 0;
 
-       $flip = ($hemi == 'W' or $hemi == 'S') ? -1 : 1;
+       $flip = ($hemi == 'W' || $hemi == 'S') ? -1 : 1;
 
        return floatval($flip * ($degrees + ($minutes / 60) + ($seconds / 3600)));
 }
@@ -44,7 +44,7 @@ function photo_albums($uid, $update = false) {
 
        $key = "photo_albums:".$uid.":".local_user().":".remote_user();
        $albums = Cache::get($key);
-       if (is_null($albums) OR $update) {
+       if (is_null($albums) || $update) {
                if (!Config::get('system', 'no_count', false)) {
                        /// @todo This query needs to be renewed. It is really slow
                        // At this time we just store the data in the cache