mirror of
https://github.com/e107inc/e107.git
synced 2025-04-19 20:21:51 +02:00
Issue #6 LANS added. Clear system cache before checking for updates. Extra checks to e_parse to avoid possible errors.
This commit is contained in:
parent
c15adc1f20
commit
5ecc0beca6
@ -83,7 +83,7 @@ class links_admin_ui extends e_admin_ui
|
||||
'link_description' => array('title'=> LAN_DESCRIPTION, 'type' => 'textarea', 'width' => 'auto'), // 'method'=>'tinymce_plugins', ?
|
||||
'link_order' => array('title'=> LAN_ORDER, 'type' => 'number', 'width' => 'auto', 'nolist'=>false, 'inline' => true),
|
||||
'link_open' => array('title'=> LCLAN_19, 'type' => 'dropdown', 'inline'=>true, 'width' => 'auto', 'batch'=>true, 'filter'=>true, 'thclass' => 'left first', 'writeParms'=>array('size'=>'xlarge')),
|
||||
'link_rel' => array('title'=> LINKLAN_11, 'type' => 'tags', 'inline'=>true, 'width' => 'auto', 'batch'=>false, 'filter'=>false, 'thclass' => 'left', 'help'=>LINKLAN_12, 'writeParms'=>array('placeholder'=>'eg.nofollow,noreferrer','size'=>'xlarge')),
|
||||
'link_rel' => array('title'=> LAN_RELATIONSHIP, 'type' => 'tags', 'inline'=>true, 'width' => 'auto', 'batch'=>false, 'filter'=>false, 'thclass' => 'left', 'help'=>LAN_RELATIONSHIP_HELP, 'writeParms'=>array('placeholder'=>'eg.nofollow,noreferrer','size'=>'xlarge')),
|
||||
|
||||
'link_function' => array('title'=> LCLAN_105, 'type' => 'method', 'data'=>'str', 'width' => 'auto', 'thclass' => 'left first'),
|
||||
'link_owner' => array('title'=> LCLAN_106, 'type' => 'hidden', 'filter'=>true, 'data'=>'str'),
|
||||
|
@ -140,6 +140,8 @@ class e107Update
|
||||
|
||||
function __construct($core=null)
|
||||
{
|
||||
e107::getCache()->clear_sys();
|
||||
|
||||
$mes = e107::getMessage();
|
||||
|
||||
$this->core = $core;
|
||||
|
@ -5425,11 +5425,13 @@ class e_parse
|
||||
require_once(e_PLUGIN . $hook . '/e_tohtml.php');
|
||||
|
||||
$hook_class = 'e_tohtml_' . $hook;
|
||||
|
||||
$this->e_hook[$hook] = new $hook_class;
|
||||
if(class_exists($hook_class))
|
||||
{
|
||||
$this->e_hook[$hook] = new $hook_class;
|
||||
}
|
||||
}
|
||||
|
||||
if(is_object($this->e_hook[$hook]))
|
||||
if(isset($this->e_hook[$hook]) && is_object($this->e_hook[$hook]))
|
||||
{
|
||||
/** @var e_tohtml_linkwords $deprecatedHook */
|
||||
$deprecatedHook = $this->e_hook[$hook];
|
||||
|
@ -82,7 +82,7 @@ class emailprint
|
||||
{
|
||||
$ico_print = (defined("ICONPRINT") && file_exists(THEME."images/".ICONPRINT) ? "<img src='".THEME_ABS."images/".ICONPRINT."' alt='".LAN_PRINT_1."' />" : $genericPrint);
|
||||
//TODO CSS class
|
||||
$text_emailprint .= "<a class='e-tip ".$class." hidden-print' href='".e_HTTP."print.php?".$print.".".$id."' title='".LAN_PRINT_1."'>".$ico_print."</a>";
|
||||
$text_emailprint .= "<a rel='alternate' class='e-tip ".$class." hidden-print' href='".e_HTTP."print.php?".$print.".".$id."' title='".LAN_PRINT_1."'>".$ico_print."</a>";
|
||||
}
|
||||
return $text_emailprint;
|
||||
}
|
||||
|
@ -584,4 +584,5 @@ define("LAN_NAVIGATION_LINKS", "Navigation Links");
|
||||
define("LAN_PAGINATION", "Pagination");
|
||||
define("LAN_X_CHARS_REMAINING", "[x] chars. remaining");
|
||||
define("LAN_UI_BATCH_NOW", "Current Date/Time");
|
||||
|
||||
define("LAN_RELATIONSHIP", "Relationship");
|
||||
define("LAN_RELATIONSHIP_HELP", "Optional 'rel' attribute. Comma separated.");
|
||||
|
@ -86,8 +86,6 @@ define("LINKLAN_8", "News Categories");
|
||||
define("LINKLAN_9", "Download Categories");
|
||||
|
||||
define("LINKLAN_10", "Theme Shortcodes");
|
||||
define("LINKLAN_11", "Relationship");
|
||||
define("LINKLAN_12", "Optional 'rel' attribute. Comma separated.");
|
||||
|
||||
|
||||
// define("LINKLAN_10", "Create Sublink");
|
||||
|
Loading…
x
Reference in New Issue
Block a user