mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 13:47:31 +02:00
Code Issues Releases Wiki Activity

Catch any debugger errors that could occur during Github sync. Added more deprecated items to the log.

Browse Source
This commit is contained in:
Cameron
2020-12-22 09:59:39 -08:00
parent 3f8e043998
commit 881670d92c
4 changed files with 17 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
e107_core/shortcodes/batch/admin_shortcodes.php
View File

@@ -747,7 +747,16 @@ class admin_shortcodes
return null; return null;
} }
$items = e107_debug::getAliases(); try
{
$items = e107_debug::getAliases();
}
catch (Exception $e)
{
e107::getDebug()->log($e->getMessage());
return null; // likely during a github update.
}
$current = e107_debug::getShortcut(); $current = e107_debug::getShortcut();
$currentAlias = !empty($items[$current]) ? " (".$items[$current].")" : ''; $currentAlias = !empty($items[$current]) ? " (".$items[$current].")" : '';

2
e107_handlers/db_debug_class.php
View File

@@ -109,7 +109,7 @@
$this->ShowIf('SQL Analysis', $this->Show_SQL_Details()); $this->ShowIf('SQL Analysis', $this->Show_SQL_Details());
$this->ShowIf('Shortcodes / BBCode', $this->Show_SC_BB()); $this->ShowIf('Shortcodes / BBCode', $this->Show_SC_BB());
$this->ShowIf('Paths', $this->Show_PATH()); $this->ShowIf('Paths', $this->Show_PATH());
$this->ShowIf('Deprecated Methods/Function Usage', $this->Show_DEPRECATED()); $this->ShowIf('Deprecated Methods/Functions', $this->Show_DEPRECATED());
if(E107_DBG_INCLUDES) if(E107_DBG_INCLUDES)
{ {

28
e107_handlers/e_parse_class.php
View File

@@ -6096,42 +6096,28 @@ class textparse {
public function editparse($text, $mode = 'off') public function editparse($text, $mode = 'off')
{ {
if(E107_DBG_DEPRECATED) trigger_error('<b>'.__METHOD__.' is deprecated. Use e107::getParser()->toForm($text) instead. ', E_USER_DEPRECATED);
{
e107::getDebug()->logDeprecated();
}
return e107::getParser()->toForm($text); return e107::getParser()->toForm($text);
} }
public function tpa($text, $mode = '', $referrer = '', $highlight_search = false, $poster_id = '') public function tpa($text, $mode = '', $referrer = '', $highlight_search = false, $poster_id = '')
{ {
if(E107_DBG_DEPRECATED) trigger_error('<b>'.__METHOD__.' is deprecated. Use e107::getParser()->toHTML($text) instead. ', E_USER_DEPRECATED);
{
e107::getDebug()->logDeprecated();
}
return e107::getParser()->toHTML($text, true, $mode, $poster_id); return e107::getParser()->toHTML($text, true, $mode, $poster_id);
} }
public function tpj($text) public function tpj($text)
{ {
trigger_error('<b>'.__METHOD__.' is deprecated. ', E_USER_DEPRECATED);
if(E107_DBG_DEPRECATED)
{
e107::getDebug()->logDeprecated();
}
return $text; return $text;
} }
public function formtpa($text, $mode = '') public function formtpa($text, $mode = '')
{ {
trigger_error('<b>'.__METHOD__.' is deprecated. Use e107::getParser()->toDB($text) instead. ', E_USER_DEPRECATED);
if(E107_DBG_DEPRECATED)
{
e107::getDebug()->logDeprecated();
}
unset($mode); // keep PHPStorm happy unset($mode); // keep PHPStorm happy
@@ -6140,11 +6126,7 @@ class textparse {
public function formtparev($text) public function formtparev($text)
{ {
trigger_error('<b>'.__METHOD__.' is deprecated. Use e107::getParser()->toForm($text) instead. ', E_USER_DEPRECATED);
if(E107_DBG_DEPRECATED)
{
e107::getDebug()->logDeprecated();
}
return e107::getParser()->toForm($text); return e107::getParser()->toForm($text);
} }

2
e107_themes/bootstrap3/theme.xml
View File

@@ -30,7 +30,7 @@
<css file="css/corporate.css" name="Corporate" scope='admin' thumbnail='images/admin_corporate.jpg' exclude='bootstrap' /> <css file="css/corporate.css" name="Corporate" scope='admin' thumbnail='images/admin_corporate.jpg' exclude='bootstrap' />
<css file="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.7/flatly/bootstrap.min.css" name="Flatly" scope='admin' exclude='bootstrap'/> <css file="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.7/flatly/bootstrap.min.css" name="Flatly" scope='admin' exclude='bootstrap'/>
<css file="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.7/sandstone/bootstrap.min.css" name="Sandstone" scope='admin' exclude='bootstrap'/> <css file="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.7/sandstone/bootstrap.min.css" name="Sandstone" scope='admin' exclude='bootstrap'/>
<css file="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.7/superhero/bootstrap.min.css" name="Superhero" thumbnail='images/admin_superhero.jpg' scope='admin,wysiwyg' exclude='bootstrap'/> <css file="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.7/superhero/bootstrap.min.css" name="Superhero" thumbnail='images/admin_superhero.jpg' scope='admin' exclude='bootstrap'/>
<css file="*" name="*"/> <css file="*" name="*"/>
</stylesheets> </stylesheets>
<layouts> <layouts>