mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-05 06:07:32 +02:00
Code Issues Releases Wiki Activity

PHP8 Remove constant conflict.

Browse Source
This commit is contained in:
Cameron
2021-01-13 17:38:34 -08:00
parent a32e646bf0
commit d22a25c877
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
e107_handlers/news_class.php
View File

@@ -295,29 +295,31 @@ class news {
if (!isset($param['image_nonew_small'])) if (!isset($param['image_nonew_small']))
{ {
if (!defined("IMAGE_nonew_small")) /* if (!defined("IMAGE_nonew_small"))
{ {
define("IMAGE_nonew_small", (file_exists(THEME."images/nonew_comments.png") ? "<img src='".THEME_ABS."images/nonew_comments.png' alt='' /> " : "<img src='".e_IMAGE_ABS."generic/nonew_comments.png' alt='' />")); define("IMAGE_nonew_small", (file_exists(THEME."images/nonew_comments.png") ? "<img src='".THEME_ABS."images/nonew_comments.png' alt='' /> " : "<img src='".e_IMAGE_ABS."generic/nonew_comments.png' alt='' />"));
} }*/
$param['image_nonew_small'] = IMAGE_nonew_small; $param['image_nonew_small'] = (file_exists(THEME."images/nonew_comments.png") ? "<img src='".THEME_ABS."images/nonew_comments.png' alt='' /> " : "<img src='".e_IMAGE_ABS."generic/nonew_comments.png' alt='' />");
} }
if (!isset($param['image_new_small'])) if (!isset($param['image_new_small']))
{ {
if (!defined("IMAGE_new_small")) /* if (!defined("IMAGE_new_small"))
{ {
define("IMAGE_new_small", (file_exists(THEME."images/new_comments.png") ? "<img src='".THEME_ABS."images/new_comments.png' alt='' /> " : "<img src='".e_IMAGE_ABS."generic/new_comments.png' alt='' /> ")); define("IMAGE_new_small", (file_exists(THEME."images/new_comments.png") ? "<img src='".THEME_ABS."images/new_comments.png' alt='' /> " : "<img src='".e_IMAGE_ABS."generic/new_comments.png' alt='' /> "));
} }
$param['image_new_small'] = IMAGE_new_small; */
$param['image_new_small'] = (file_exists(THEME."images/new_comments.png") ? "<img src='".THEME_ABS."images/new_comments.png' alt='' /> " : "<img src='".e_IMAGE_ABS."generic/new_comments.png' alt='' /> ");
} }
if (!isset($param['image_sticky'])) if (!isset($param['image_sticky']))
{ {
if (!defined("IMAGE_sticky")) /* if (!defined("IMAGE_sticky"))
{ {
define("IMAGE_sticky", (file_exists(THEME."images/sticky.png") ? "<img src='".THEME_ABS."images/sticky.png' alt='' /> " : "<img src='".e_IMAGE_ABS."generic/sticky.png' alt='' style='width: 14px; height: 14px; vertical-align: bottom' /> ")); define("IMAGE_sticky", (file_exists(THEME."images/sticky.png") ? "<img src='".THEME_ABS."images/sticky.png' alt='' /> " : "<img src='".e_IMAGE_ABS."generic/sticky.png' alt='' style='width: 14px; height: 14px; vertical-align: bottom' /> "));
} }*/
$param['image_sticky'] = IMAGE_sticky; $param['image_sticky'] = (file_exists(THEME."images/sticky.png") ? "<img src='".THEME_ABS."images/sticky.png' alt='' /> " : "<img src='".e_IMAGE_ABS."generic/sticky.png' alt='' style='width: 14px; height: 14px; vertical-align: bottom' /> ");
} }
e107::setRegistry('current_news_item', $news); e107::setRegistry('current_news_item', $news);

1
e107_handlers/user_extended_class.php
View File

@@ -913,6 +913,7 @@ class e107_user_extended
// wrong type // wrong type
if(false === $field_info) if(false === $field_info)
{ {
trigger_error('$field_info is false: '.__METHOD__, E_USER_NOTICE);
e107::getMessage()->addDebug("\$field_info is false ".__METHOD__); e107::getMessage()->addDebug("\$field_info is false ".__METHOD__);
return false; return false;
} }