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

Issue #6 Removed duplicate LAN_SEARCH from English.php. PHP Notice removal.

Browse Source
This commit is contained in:
Cameron
2015-08-24 10:19:34 -07:00
parent c86e9812f3
commit 29b405d31d
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
e107_handlers/e_parse_class.php
View File

@@ -3271,6 +3271,11 @@ class e_parser
*/ */
function toVideo($file, $parm=array()) function toVideo($file, $parm=array())
{ {
if(empty($file))
{
return false;
}
list($id,$type) = explode(".",$file,2); list($id,$type) = explode(".",$file,2);
$thumb = vartrue($parm['thumb']); $thumb = vartrue($parm['thumb']);

1
e107_languages/English/English.php
View File

@@ -112,7 +112,6 @@ define("LAN_TITLE", "Title");
define("LAN_USER", "User"); define("LAN_USER", "User");
define("LAN_EMAIL","Email address"); define("LAN_EMAIL","Email address");
define("LAN_WROTE", "wrote"); // as in John wrote.." "; define("LAN_WROTE", "wrote"); // as in John wrote.." ";
define("LAN_SEARCH", "Search");
define("LAN_RE_ORDER", "Re-order"); define("LAN_RE_ORDER", "Re-order");
define("LAN_ENTER_USRNAME_EMAIL", "Please enter your username or email"); // admin php hover field admin name define("LAN_ENTER_USRNAME_EMAIL", "Please enter your username or email"); // admin php hover field admin name

4
news.php
View File

@@ -288,12 +288,14 @@ if ($action == 'cat' || $action == 'all' || vartrue($_GET['tag']))
$param['itemlink'] = (defined("NEWSLIST_ITEMLINK")) ? NEWSLIST_ITEMLINK : ""; $param['itemlink'] = (defined("NEWSLIST_ITEMLINK")) ? NEWSLIST_ITEMLINK : "";
$param['thumbnail'] =(defined("NEWSLIST_THUMB")) ? NEWSLIST_THUMB : "border:0px"; $param['thumbnail'] =(defined("NEWSLIST_THUMB")) ? NEWSLIST_THUMB : "border:0px";
$param['catlink'] = (defined("NEWSLIST_CATLINK")) ? NEWSLIST_CATLINK : ""; $param['catlink'] = (defined("NEWSLIST_CATLINK")) ? NEWSLIST_CATLINK : "";
$param['caticon'] = (defined("NEWSLIST_CATICON")) ? NEWSLIST_CATICON : ICONSTYLE; $param['caticon'] = (defined("NEWSLIST_CATICON")) ? NEWSLIST_CATICON : defset('ICONSTYLE','');
$param['current_action'] = $action; $param['current_action'] = $action;
// NEW - allow news batch shortcode override (e.g. e107::getScBatch('news', 'myplugin', true); ) // NEW - allow news batch shortcode override (e.g. e107::getScBatch('news', 'myplugin', true); )
e107::getEvent()->trigger('news_list_parse', $newsList); e107::getEvent()->trigger('news_list_parse', $newsList);
$text = '';
if(vartrue($template['start'])) if(vartrue($template['start']))
{ {
$text .= $tp->parseTemplate($template['start'], true); $text .= $tp->parseTemplate($template['start'], true);