mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 12:48:26 +02:00
Code Issues Releases Wiki Activity

Notice removal

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_admin/includes/infopanel.php
View File

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

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

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

59
e107_handlers/comment_class.php
View File

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