Move Object\Contact to Model\Contact
This commit is contained in:
parent
d4ca30a6db
commit
18d93cddf6
50 changed files with 62 additions and 64 deletions
|
@ -10,8 +10,8 @@ use Friendica\Core\System;
|
|||
use Friendica\Core\Config;
|
||||
use Friendica\Core\Worker;
|
||||
use Friendica\Database\DBM;
|
||||
use Friendica\Model\Contact;
|
||||
use Friendica\Model\User;
|
||||
use Friendica\Object\Contact;
|
||||
|
||||
require_once 'include/enotify.php';
|
||||
require_once 'include/text.php';
|
||||
|
|
|
@ -5,8 +5,8 @@
|
|||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Database\DBM;
|
||||
use Friendica\Model\Contact;
|
||||
use Friendica\Model\GlobalContact;
|
||||
use Friendica\Object\Contact;
|
||||
|
||||
require_once 'include/contact_selectors.php';
|
||||
require_once 'mod/contacts.php';
|
||||
|
|
|
@ -11,7 +11,7 @@ use Friendica\Core\Config;
|
|||
use Friendica\Core\PConfig;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Database\DBM;
|
||||
use Friendica\Object\Contact;
|
||||
use Friendica\Model\Contact;
|
||||
|
||||
require_once 'include/event.php';
|
||||
require_once 'include/redir.php';
|
||||
|
|
|
@ -4,8 +4,8 @@
|
|||
*/
|
||||
use Friendica\App;
|
||||
use Friendica\Database\DBM;
|
||||
use Friendica\Model\Contact;
|
||||
use Friendica\Model\GlobalContact;
|
||||
use Friendica\Object\Contact;
|
||||
|
||||
require_once 'include/contact_selectors.php';
|
||||
require_once 'mod/contacts.php';
|
||||
|
|
|
@ -6,9 +6,9 @@ use Friendica\App;
|
|||
use Friendica\Core\System;
|
||||
use Friendica\Core\Worker;
|
||||
use Friendica\Database\DBM;
|
||||
use Friendica\Model\Contact;
|
||||
use Friendica\Model\GlobalContact;
|
||||
use Friendica\Network\Probe;
|
||||
use Friendica\Object\Contact;
|
||||
|
||||
require_once 'include/contact_selectors.php';
|
||||
require_once 'mod/proxy.php';
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
use Friendica\App;
|
||||
use Friendica\Core\Config;
|
||||
use Friendica\Database\DBM;
|
||||
use Friendica\Object\Contact;
|
||||
use Friendica\Model\Contact;
|
||||
|
||||
require_once 'include/contact_selectors.php';
|
||||
require_once 'mod/contacts.php';
|
||||
|
|
|
@ -24,8 +24,8 @@ use Friendica\Core\PConfig;
|
|||
use Friendica\Core\System;
|
||||
use Friendica\Core\Worker;
|
||||
use Friendica\Database\DBM;
|
||||
use Friendica\Model\Contact;
|
||||
use Friendica\Network\Probe;
|
||||
use Friendica\Object\Contact;
|
||||
use Friendica\Protocol\Diaspora;
|
||||
|
||||
require_once 'include/enotify.php';
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
use Friendica\App;
|
||||
use Friendica\Core\Config;
|
||||
use Friendica\Database\DBM;
|
||||
use Friendica\Object\Contact;
|
||||
use Friendica\Model\Contact;
|
||||
use Friendica\Protocol\DFRN;
|
||||
|
||||
require_once 'include/items.php';
|
||||
|
|
|
@ -15,8 +15,8 @@ use Friendica\Core\Config;
|
|||
use Friendica\Core\PConfig;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Database\DBM;
|
||||
use Friendica\Model\Contact;
|
||||
use Friendica\Network\Probe;
|
||||
use Friendica\Object\Contact;
|
||||
|
||||
require_once 'include/enotify.php';
|
||||
require_once 'include/group.php';
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
use Friendica\App;
|
||||
use Friendica\Core\Config;
|
||||
use Friendica\Database\DBM;
|
||||
use Friendica\Object\Contact;
|
||||
use Friendica\Model\Contact;
|
||||
|
||||
function directory_init(App $a) {
|
||||
$a->set_pager_itemspage(60);
|
||||
|
|
|
@ -6,9 +6,9 @@ use Friendica\App;
|
|||
use Friendica\Core\Config;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Core\Worker;
|
||||
use Friendica\Model\Contact;
|
||||
use Friendica\Model\GlobalContact;
|
||||
use Friendica\Network\Probe;
|
||||
use Friendica\Object\Contact;
|
||||
use Friendica\Protocol\PortableContact;
|
||||
|
||||
require_once 'include/contact_widgets.php';
|
||||
|
|
|
@ -4,7 +4,7 @@ use Friendica\App;
|
|||
use Friendica\Core\Config;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Database\DBM;
|
||||
use Friendica\Object\Contact;
|
||||
use Friendica\Model\Contact;
|
||||
use Friendica\Protocol\DFRN;
|
||||
|
||||
function display_init(App $a) {
|
||||
|
|
|
@ -3,8 +3,8 @@
|
|||
use Friendica\App;
|
||||
use Friendica\Core\Config;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Model\Contact;
|
||||
use Friendica\Network\Probe;
|
||||
use Friendica\Object\Contact;
|
||||
|
||||
require_once 'include/follow.php';
|
||||
require_once 'include/contact_selectors.php';
|
||||
|
|
|
@ -10,8 +10,8 @@
|
|||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\Config;
|
||||
use Friendica\Model\Contact;
|
||||
use Friendica\Model\GlobalContact;
|
||||
use Friendica\Object\Contact;
|
||||
|
||||
function hovercard_init(App $a) {
|
||||
// Just for testing purposes
|
||||
|
|
|
@ -22,9 +22,9 @@ use Friendica\Core\Config;
|
|||
use Friendica\Core\System;
|
||||
use Friendica\Core\Worker;
|
||||
use Friendica\Database\DBM;
|
||||
use Friendica\Model\Contact;
|
||||
use Friendica\Model\GlobalContact;
|
||||
use Friendica\Network\Probe;
|
||||
use Friendica\Object\Contact;
|
||||
use Friendica\Protocol\Diaspora;
|
||||
use Friendica\Protocol\Email;
|
||||
use Friendica\Util\Emailer;
|
||||
|
|
|
@ -6,7 +6,7 @@ use Friendica\App;
|
|||
use Friendica\Core\Config;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Database\DBM;
|
||||
use Friendica\Object\Contact;
|
||||
use Friendica\Model\Contact;
|
||||
|
||||
require_once 'include/text.php';
|
||||
require_once 'include/contact_widgets.php';
|
||||
|
|
|
@ -4,7 +4,7 @@ use Friendica\App;
|
|||
use Friendica\Content\Smilies;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Database\DBM;
|
||||
use Friendica\Object\Contact;
|
||||
use Friendica\Model\Contact;
|
||||
|
||||
require_once 'include/acl_selectors.php';
|
||||
require_once 'include/message.php';
|
||||
|
|
|
@ -9,7 +9,7 @@ use Friendica\Core\System;
|
|||
use Friendica\Core\Config;
|
||||
use Friendica\Core\PConfig;
|
||||
use Friendica\Database\DBM;
|
||||
use Friendica\Object\Contact;
|
||||
use Friendica\Model\Contact;
|
||||
|
||||
require_once 'include/conversation.php';
|
||||
require_once 'include/group.php';
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
*/
|
||||
use Friendica\App;
|
||||
use Friendica\Database\DBM;
|
||||
use Friendica\Object\Contact;
|
||||
use Friendica\Model\Contact;
|
||||
|
||||
require_once 'include/contact_selectors.php';
|
||||
|
||||
|
|
|
@ -8,9 +8,9 @@ use Friendica\Core\System;
|
|||
use Friendica\Core\Config;
|
||||
use Friendica\Core\Worker;
|
||||
use Friendica\Database\DBM;
|
||||
use Friendica\Model\Contact;
|
||||
use Friendica\Model\Photo;
|
||||
use Friendica\Network\Probe;
|
||||
use Friendica\Object\Contact;
|
||||
use Friendica\Object\Image;
|
||||
|
||||
require_once 'include/photos.php';
|
||||
|
|
|
@ -9,7 +9,7 @@ use Friendica\Core\Cache;
|
|||
use Friendica\Core\System;
|
||||
use Friendica\Core\PConfig;
|
||||
use Friendica\Database\DBM;
|
||||
use Friendica\Object\Contact;
|
||||
use Friendica\Model\Contact;
|
||||
use Friendica\Util\XML;
|
||||
|
||||
require_once 'include/datetime.php';
|
||||
|
|
|
@ -5,8 +5,8 @@
|
|||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Database\DBM;
|
||||
use Friendica\Model\Contact;
|
||||
use Friendica\Model\GlobalContact;
|
||||
use Friendica\Object\Contact;
|
||||
|
||||
require_once 'include/contact_widgets.php';
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Database\DBM;
|
||||
use Friendica\Object\Contact;
|
||||
use Friendica\Model\Contact;
|
||||
|
||||
require_once 'include/follow.php';
|
||||
require_once 'include/contact_selectors.php';
|
||||
|
|
|
@ -5,7 +5,7 @@ use Friendica\Core\Config;
|
|||
use Friendica\Core\System;
|
||||
use Friendica\Core\Worker;
|
||||
use Friendica\Database\DBM;
|
||||
use Friendica\Object\Contact;
|
||||
use Friendica\Model\Contact;
|
||||
|
||||
require_once('include/items.php');
|
||||
require_once('include/acl_selectors.php');
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
use Friendica\App;
|
||||
use Friendica\Core\Config;
|
||||
use Friendica\Database\DBM;
|
||||
use Friendica\Object\Contact;
|
||||
use Friendica\Model\Contact;
|
||||
|
||||
require_once('include/contact_selectors.php');
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue