Merge pull request #459 from annando/bugfix-photo

Some includes hadn't been removed
pull/460/head
Hypolite Petovan 2017-12-01 18:16:44 -05:00 committed by GitHub
commit 3a1b172d08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 4 deletions

View File

@ -309,7 +309,6 @@ function fromgplus_cleantext($text) {
} }
function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) { function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
require_once("include/Photo.php");
require_once("include/items.php"); require_once("include/items.php");
require_once("include/network.php"); require_once("include/network.php");

View File

@ -14,7 +14,6 @@ use Friendica\Object\Contact;
require 'addon/pumpio/oauth/http.php'; require 'addon/pumpio/oauth/http.php';
require 'addon/pumpio/oauth/oauth_client.php'; require 'addon/pumpio/oauth/oauth_client.php';
require_once 'include/enotify.php'; require_once 'include/enotify.php';
require_once "include/Photo.php";
require_once "mod/share.php"; require_once "mod/share.php";
define('PUMPIO_DEFAULT_POLL_INTERVAL', 5); // given in minutes define('PUMPIO_DEFAULT_POLL_INTERVAL', 5); // given in minutes

View File

@ -947,8 +947,6 @@ function twitter_queue_hook(&$a,&$b) {
} }
function twitter_fix_avatar($avatar) { function twitter_fix_avatar($avatar) {
require_once("include/Photo.php");
$new_avatar = str_replace("_normal.", ".", $avatar); $new_avatar = str_replace("_normal.", ".", $avatar);
$info = Photo::getInfoFromURL($new_avatar); $info = Photo::getInfoFromURL($new_avatar);