1
0
mirror of https://github.com/e107inc/e107.git synced 2025-04-20 20:51:53 +02:00

Notice removal

This commit is contained in:
Cameron 2013-04-29 15:58:33 -07:00
parent 45b70ee005
commit 231f4344d1
3 changed files with 33 additions and 31 deletions

View File

@ -35,7 +35,7 @@ class adminstyle_infopanel
join_text: "auto",
avatar_size: 16,
retweets: false,
count: 3,
count: 4,
fetch: 5,
template: "{text}<br />- {time} » {retweet_action}",
filter: function(t){ return ! /^@\w+/.test(t.tweet_raw_text); },

View File

@ -1838,10 +1838,9 @@ Inverse 10 <span class="badge badge-inverse">10</span>
foreach($var as $key=>$link)
{
if(strpos(e_SELF,$link['link']))
if(varset($link['link']) && strpos(e_SELF,$link['link']))
{
$action = $key;
}
}

View File

@ -1199,40 +1199,43 @@ class comment
return $data;
}
$files = e107::getPref('e_comment_list');
foreach ($files as $file=>$perms)
if($files = e107::getPref('e_comment_list'))
{
unset($e_comment, $key);
include (e_PLUGIN.$file."/e_comment.php");
if ($e_comment && is_array($e_comment))
foreach ($files as $file=>$perms)
{
$key = $e_comment['eplug_comment_ids'];
if (isset($key) && $key != '')
unset($e_comment, $key);
include (e_PLUGIN.$file."/e_comment.php");
if ($e_comment && is_array($e_comment))
{
$data[$key] = $e_comment;
}
}
else
{
//convert old method variables into the same array method
$key = $e_plug_table;
if (isset($key) && $key != '')
{
$e_comment['eplug_comment_ids'] = $e_plug_table;
$e_comment['plugin_name'] = $plugin_name;
$e_comment['plugin_path'] = $plugin_path;
$e_comment['reply_location'] = $reply_location;
$e_comment['db_title'] = $link_name;
$e_comment['db_id'] = $db_id;
$e_comment['db_table'] = $db_table;
$e_comment['qry'] = '';
$data[$key] = $e_comment;
$key = $e_comment['eplug_comment_ids'];
if (isset($key) && $key != '')
{
$data[$key] = $e_comment;
}
}
else
{
//convert old method variables into the same array method
$key = $e_plug_table;
if (isset($key) && $key != '')
{
$e_comment['eplug_comment_ids'] = $e_plug_table;
$e_comment['plugin_name'] = $plugin_name;
$e_comment['plugin_path'] = $plugin_path;
$e_comment['reply_location'] = $reply_location;
$e_comment['db_title'] = $link_name;
$e_comment['db_id'] = $db_id;
$e_comment['db_table'] = $db_table;
$e_comment['qry'] = '';
$data[$key] = $e_comment;
}
}
}
cachevars('e_comment', $data);
return $data;
}
cachevars('e_comment', $data);
return $data;
}
/*
* get number of records from comments db