harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove the app $a passed to profile_load, also add profile_load to mod_wiki which should fix issue #431

Browse Source
This commit is contained in:
redmatrix 2016-06-26 22:13:59 -07:00
parent 2029b2b9ed
commit 3035c792dc
27 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Module/Achievements.php
View File

@ -18,7 +18,7 @@ class Achievements extends \Zotlabs\Web\Controller {
$profile = 0; $profile = 0;
$profile = argv(1); $profile = argv(1);
profile_load($a,$which,$profile); profile_load($which,$profile);
$r = q("select channel_id from channel where channel_address = '%s'", $r = q("select channel_id from channel where channel_address = '%s'",
dbesc($which) dbesc($which)

2
Zotlabs/Module/Block.php
View File

@ -12,7 +12,7 @@ class Block extends \Zotlabs\Web\Controller {
$which = argv(1); $which = argv(1);
$profile = 0; $profile = 0;
profile_load($a,$which,$profile); profile_load($which,$profile);
if(\App::$profile['profile_uid']) if(\App::$profile['profile_uid'])
head_set_icon(\App::$profile['thumb']); head_set_icon(\App::$profile['thumb']);

2
Zotlabs/Module/Blocks.php
View File

@ -22,7 +22,7 @@ class Blocks extends \Zotlabs\Web\Controller {
else else
return; return;
profile_load($a,$which); profile_load($which);
} }

2
Zotlabs/Module/Cal.php
View File

@ -20,7 +20,7 @@ class Cal extends \Zotlabs\Web\Controller {
if(argc() > 1) { if(argc() > 1) {
$nick = argv(1); $nick = argv(1);
profile_load($a,$nick); profile_load($nick);
$channelx = channelx_by_nick($nick); $channelx = channelx_by_nick($nick);

2
Zotlabs/Module/Channel.php
View File

@ -48,7 +48,7 @@ class Channel extends \Zotlabs\Web\Controller {
// Run profile_load() here to make sure the theme is set before // Run profile_load() here to make sure the theme is set before
// we start loading content // we start loading content
profile_load($a,$which,$profile); profile_load($which,$profile);
} }

2
Zotlabs/Module/Chat.php
View File

@ -39,7 +39,7 @@ class Chat extends \Zotlabs\Web\Controller {
// Run profile_load() here to make sure the theme is set before // Run profile_load() here to make sure the theme is set before
// we start loading content // we start loading content
profile_load($a,$which,$profile); profile_load($which,$profile);
} }

2
Zotlabs/Module/Cloud.php
View File

@ -37,7 +37,7 @@ class Cloud extends \Zotlabs\Web\Controller {
\App::$page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . z_root() . '/feed/' . $which . '" />' . "\r\n"; \App::$page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . z_root() . '/feed/' . $which . '" />' . "\r\n";
if ($which) if ($which)
profile_load($a, $which, $profile); profile_load( $which, $profile);
$auth = new \Zotlabs\Storage\BasicAuth(); $auth = new \Zotlabs\Storage\BasicAuth();

2
Zotlabs/Module/Common.php
View File

@ -21,7 +21,7 @@ class Common extends \Zotlabs\Web\Controller {
); );
if($x) if($x)
profile_load($a,$x[0]['channel_address'],0); profile_load($x[0]['channel_address'],0);
} }

2
Zotlabs/Module/Connect.php
View File

@ -26,7 +26,7 @@ class Connect extends \Zotlabs\Web\Controller {
if($r) if($r)
\App::$data['channel'] = $r[0]; \App::$data['channel'] = $r[0];
profile_load($a,$which,''); profile_load($which,'');
} }
function post() { function post() {

2
Zotlabs/Module/Cover_photo.php
View File

@ -29,7 +29,7 @@ class Cover_photo extends \Zotlabs\Web\Controller {
} }
$channel = \App::get_channel(); $channel = \App::get_channel();
profile_load($a,$channel['channel_address']); profile_load($channel['channel_address']);
} }

2
Zotlabs/Module/Dav.php
View File

@ -58,7 +58,7 @@ class Dav extends \Zotlabs\Web\Controller {
\App::$page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . z_root() . '/feed/' . $which . '" />' . "\r\n"; \App::$page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . z_root() . '/feed/' . $which . '" />' . "\r\n";
if ($which) if ($which)
profile_load($a, $which, $profile); profile_load( $which, $profile);

2
Zotlabs/Module/Editblock.php
View File

@ -21,7 +21,7 @@ class Editblock extends \Zotlabs\Web\Controller {
else else
return; return;
profile_load($a,$which); profile_load($which);
} }

2
Zotlabs/Module/Editlayout.php
View File

@ -21,7 +21,7 @@ class Editlayout extends \Zotlabs\Web\Controller {
else else
return; return;
profile_load($a,$which); profile_load($which);
} }

2
Zotlabs/Module/Editwebpage.php
View File

@ -23,7 +23,7 @@ class Editwebpage extends \Zotlabs\Web\Controller {
else else
return; return;
profile_load($a,$which); profile_load($which);
} }

2
Zotlabs/Module/Hcard.php
View File

@ -40,7 +40,7 @@ class Hcard extends \Zotlabs\Web\Controller {
} }
} }
profile_load($a,$which,$profile); profile_load($which,$profile);
} }

2
Zotlabs/Module/Id.php
View File

@ -57,7 +57,7 @@ class Id extends \Zotlabs\Web\Controller {
$profile = ''; $profile = '';
$channel = \App::get_channel(); $channel = \App::get_channel();
profile_load($a,$which,$profile); profile_load($which,$profile);
$op = new MysqlProvider; $op = new MysqlProvider;
$op->server(); $op->server();

2
Zotlabs/Module/Layouts.php
View File

@ -21,7 +21,7 @@ class Layouts extends \Zotlabs\Web\Controller {
else else
return; return;
profile_load($a,$which); profile_load($which);
} }

2
Zotlabs/Module/Page.php
View File

@ -13,7 +13,7 @@ class Page extends \Zotlabs\Web\Controller {
$which = argv(1); $which = argv(1);
$profile = 0; $profile = 0;
profile_load($a,$which,$profile); profile_load($which,$profile);

2
Zotlabs/Module/Photos.php
View File

@ -27,7 +27,7 @@ class Photos extends \Zotlabs\Web\Controller {
if(argc() > 1) { if(argc() > 1) {
$nick = argv(1); $nick = argv(1);
profile_load($a,$nick); profile_load($nick);
$channelx = channelx_by_nick($nick); $channelx = channelx_by_nick($nick);

2
Zotlabs/Module/Profile.php
View File

@ -48,7 +48,7 @@ class Profile extends \Zotlabs\Web\Controller {
} }
} }
profile_load($a,$which,$profile); profile_load($which,$profile);
} }

2
Zotlabs/Module/Profile_photo.php
View File

@ -34,7 +34,7 @@ class Profile_photo extends \Zotlabs\Web\Controller {
} }
$channel = \App::get_channel(); $channel = \App::get_channel();
profile_load($a,$channel['channel_address']); profile_load($channel['channel_address']);
} }

4
Zotlabs/Module/Profiles.php
View File

@ -193,7 +193,7 @@ class Profiles extends \Zotlabs\Web\Controller {
$chan = \App::get_channel(); $chan = \App::get_channel();
profile_load($a,$chan['channel_address'],$r[0]['id']); profile_load($chan['channel_address'],$r[0]['id']);
} }
} }
@ -584,7 +584,7 @@ class Profiles extends \Zotlabs\Web\Controller {
if($is_default) { if($is_default) {
// reload the info for the sidebar widget - why does this not work? // reload the info for the sidebar widget - why does this not work?
profile_load($a,$channel['channel_address']); profile_load($channel['channel_address']);
\Zotlabs\Daemon\Master::Summon(array('Directory',local_channel())); \Zotlabs\Daemon\Master::Summon(array('Directory',local_channel()));
} }
} }

2
Zotlabs/Module/Profperm.php
View File

@ -17,7 +17,7 @@ class Profperm extends \Zotlabs\Web\Controller {
$profile = \App::$argv[1]; $profile = \App::$argv[1];
profile_load($a,$which,$profile); profile_load($which,$profile);
} }

2
Zotlabs/Module/Viewconnections.php
View File

@ -11,7 +11,7 @@ class Viewconnections extends \Zotlabs\Web\Controller {
return; return;
} }
if(argc() > 1) if(argc() > 1)
profile_load($a,argv(1)); profile_load(argv(1));
} }
function get() { function get() {

2
Zotlabs/Module/Webpages.php
View File

@ -23,7 +23,7 @@ class Webpages extends \Zotlabs\Web\Controller {
else else
return; return;
profile_load($a,$which); profile_load($which);
} }

2
Zotlabs/Module/Wiki.php
View File

@ -20,6 +20,8 @@ class Wiki extends \Zotlabs\Web\Controller {
notice(t('You must be logged in to see this page.') . EOL); notice(t('You must be logged in to see this page.') . EOL);
goaway('/login'); goaway('/login');
} }
profile_load($nick);
} }
function get() { function get() {

3
include/channel.php
View File

@ -761,11 +761,10 @@ function identity_export_year($channel_id,$year,$month = 0) {
* *
* The channel default theme is also selected for use, unless over-riden elsewhere. * The channel default theme is also selected for use, unless over-riden elsewhere.
* *
* @param[in,out] App &$a
* @param string $nickname * @param string $nickname
* @param string $profile * @param string $profile
*/ */
function profile_load(&$a, $nickname, $profile = '') { function profile_load($nickname, $profile = '') {
// logger('profile_load: ' . $nickname . (($profile) ? ' profile: ' . $profile : '')); // logger('profile_load: ' . $nickname . (($profile) ? ' profile: ' . $profile : ''));