mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2025-01-18 18:46:17 +00:00
updating session requires and removing deperacted method from text helper
This commit is contained in:
parent
a9d98e73c3
commit
61c2c3009d
3 changed files with 2 additions and 23 deletions
|
@ -502,7 +502,7 @@ class CakeSession extends Object {
|
||||||
case 'cache':
|
case 'cache':
|
||||||
if (empty($_SESSION)) {
|
if (empty($_SESSION)) {
|
||||||
if (!class_exists('Cache')) {
|
if (!class_exists('Cache')) {
|
||||||
uses('Cache');
|
require LIBS . 'cache.php';
|
||||||
}
|
}
|
||||||
if ($iniSet) {
|
if ($iniSet) {
|
||||||
ini_set('session.use_trans_sid', 0);
|
ini_set('session.use_trans_sid', 0);
|
||||||
|
|
|
@ -25,9 +25,8 @@
|
||||||
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
|
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
|
||||||
*/
|
*/
|
||||||
if (!class_exists('cakesession')) {
|
if (!class_exists('cakesession')) {
|
||||||
uses('session');
|
require LIBS . 'cake_session.php';
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Session Helper.
|
* Session Helper.
|
||||||
*
|
*
|
||||||
|
|
|
@ -320,25 +320,5 @@ class TextHelper extends AppHelper {
|
||||||
}
|
}
|
||||||
return $r;
|
return $r;
|
||||||
}
|
}
|
||||||
/**
|
|
||||||
* Text-to-html parser, similar to Textile or RedCloth, only with a little different syntax.
|
|
||||||
*
|
|
||||||
* @param string $text String to "flay"
|
|
||||||
* @param boolean $allowHtml Set to true if if html is allowed
|
|
||||||
* @return string "Flayed" text
|
|
||||||
* @access public
|
|
||||||
* @todo Change this. We need a real Textile parser.
|
|
||||||
* @codeCoverageIgnoreStart
|
|
||||||
*/
|
|
||||||
function flay($text, $allowHtml = false) {
|
|
||||||
trigger_error(__('(TextHelper::flay) Deprecated: the Flay library is no longer supported and will be removed in a future version.', true), E_USER_WARNING);
|
|
||||||
if (!class_exists('Flay')) {
|
|
||||||
uses('flay');
|
|
||||||
}
|
|
||||||
return Flay::toHtml($text, false, $allowHtml);
|
|
||||||
}
|
|
||||||
/**
|
|
||||||
* @codeCoverageIgnoreEnd
|
|
||||||
*/
|
|
||||||
}
|
}
|
||||||
?>
|
?>
|
Loading…
Add table
Reference in a new issue