Switch to Core\Session

- Remove reference to include/session
- Use new Session::init()
- Prevent variable re-assignation if they're just empty
- Deprecate killme() function
- Correct DOMXPath class spelling
pull/4382/head
Hypolite Petovan 2018-02-03 00:46:05 -05:00
rodzic 55c63949c4
commit d5753b21ae
2 zmienionych plików z 9 dodań i 11 usunięć

Wyświetl plik

@ -873,13 +873,10 @@ function get_guid($size = 16, $prefix = "")
/**
* @brief Used to end the current process, after saving session state.
* @deprecated
*/
function killme()
{
if (!get_app()->is_backend()) {
session_write_close();
}
exit();
}

Wyświetl plik

@ -12,10 +12,11 @@ use Friendica\App;
use Friendica\BaseObject;
use Friendica\Content\Nav;
use Friendica\Core\Addon;
use Friendica\Core\System;
use Friendica\Core\Theme;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\Session;
use Friendica\Core\System;
use Friendica\Core\Theme;
use Friendica\Core\Worker;
use Friendica\Database\DBM;
use Friendica\Model\Profile;
@ -77,7 +78,7 @@ if (!$install) {
exit();
}
require_once 'include/session.php';
Session::init();
Addon::loadHooks();
Addon::callHooks('init_1');
@ -166,16 +167,16 @@ $a->page['htmlhead'] = '';
$a->page['end'] = '';
if (! x($_SESSION, 'sysmsg')) {
if (x($_SESSION, 'sysmsg') === false) {
$_SESSION['sysmsg'] = [];
}
if (! x($_SESSION, 'sysmsg_info')) {
if (x($_SESSION, 'sysmsg_info') === false) {
$_SESSION['sysmsg_info'] = [];
}
// Array for informations about last received items
if (! x($_SESSION, 'last_updated')) {
if (x($_SESSION, 'last_updated') === false) {
$_SESSION['last_updated'] = [];
}
/*
@ -474,7 +475,7 @@ if (isset($_GET["mode"]) && (($_GET["mode"] == "raw") || ($_GET["mode"] == "mini
/// @TODO one day, kill those error-surpressing @ stuff, or PHP should ban it
@$doc->loadHTML($content);
$xpath = new DomXPath($doc);
$xpath = new DOMXPath($doc);
$list = $xpath->query("//*[contains(@id,'tread-wrapper-')]"); /* */