From 8224eadad77320769fc6d46ac496027685480a42 Mon Sep 17 00:00:00 2001
From: Exile <iglix@me.com>
Date: Wed, 10 Dec 2014 20:01:00 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A7=D0=B8=D1=81=D1=82=D0=BA=D0=B0=20=D1=84?=
 =?UTF-8?q?=D0=B0=D0=B9=D0=BB=D0=B0=20=D1=81=D0=B5=D1=81=D1=81=D0=B8=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Удаление двух давно неиспользуемых функций + сопутствующее исправление в функции bb_die.
---
 library/includes/functions.php |  6 +++---
 library/includes/sessions.php  | 20 --------------------
 2 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/library/includes/functions.php b/library/includes/functions.php
index 7b132865d..7312d090b 100644
--- a/library/includes/functions.php
+++ b/library/includes/functions.php
@@ -1681,7 +1681,7 @@ function obtain_word_list (&$orig_word, &$replacement_word)
 
 function bb_die ($msg_text)
 {
-	global $ajax, $bb_cfg, $lang, $template, $theme, $userdata;
+	global $ajax, $bb_cfg, $lang, $template, $theme, $user;
 
 	if (defined('IN_AJAX'))
 	{
@@ -1703,9 +1703,9 @@ function bb_die ($msg_text)
 	}
 
 	// If empty session
-	if (empty($userdata))
+	if (empty($user))
 	{
-		$userdata = session_pagestart();
+		$user->session_start();
 	}
 
 	// If the header hasn't been output then do it
diff --git a/library/includes/sessions.php b/library/includes/sessions.php
index 6559c67b9..c10905b69 100644
--- a/library/includes/sessions.php
+++ b/library/includes/sessions.php
@@ -829,24 +829,4 @@ function delete_user_sessions ($user_id)
 
 	$user_id = get_id_csv($user_id);
 	DB()->query("DELETE FROM ". BB_SESSIONS ." WHERE session_user_id IN($user_id)");
-}
-
-// deprecated
-function session_begin ($userdata, $page_id = 0, $enable_autologin = false, $auto_created = false)
-{
-	global $user;
-
-	$user->session_create($userdata, $auto_created);
-
-	return $user->data;
-}
-
-// deprecated
-function session_pagestart ($user_ip = USER_IP, $page_id = 0, $req_login = false)
-{
-	global $user;
-
-	$user->session_start(array('req_login' => $req_login));
-
-	return $user->data;
 }
\ No newline at end of file