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

LAN Fix, Notice removal and stats trigger.

Browse Source
This commit is contained in:
Cameron
2016-12-22 13:11:26 -08:00
parent 34f96ff932
commit abe3b355d4
3 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
e107_admin/update_routines.php
View File

@@ -246,7 +246,7 @@ class e107Update
{ {
if(!$list = e107::getPlugin()->updateRequired()) if(!$list = e107::getPlugin()->updateRequired())
{ {
return; return false;
} }
$frm = e107::getForm(); $frm = e107::getForm();
@@ -1961,5 +1961,18 @@ function convert_serialized($serializedData, $type='')
return $data; return $data;
} }
function theme_foot()
{
global $pref;
if(!empty($_POST['update_core']['706_to_800']))
{
$data = array('name'=>SITENAME, 'theme'=>$pref['sitetheme'], 'language'=>e_LANGUAGE, 'url'=>SITEURL, 'type'=>'upgrade');
$base = base64_encode(http_build_query($data, null, '&'));
$url = "https://e107.org/e-install/".$base;
return "<img src='".$url."' style='width:1px; height:1px;border:0' />";
}
}
?> ?>

2
e107_languages/English/lan_news.php
View File

@@ -50,4 +50,6 @@ define("LAN_NEWS_463", "There are no news items for the specified category - ple
define("LAN_NEWS_100", "On"); define("LAN_NEWS_100", "On");
define("LAN_NEWS_307", "Total posts in this category: "); define("LAN_NEWS_307", "Total posts in this category: ");
define("LAN_NEWS_308", "Perhaps you're looking for one of the news items below?");
?> ?>

7
e107_plugins/news/news.php
View File

@@ -1008,19 +1008,14 @@ class news_front
} }
else else
{ {
// $action = 'default';
//XXX item not found, redirect to avoid messing up search-engine data.
// e107::getRedirect()->go(null, true, 404);
header("HTTP/1.0 404 Not Found",true,404); header("HTTP/1.0 404 Not Found",true,404);
require_once(e_LANGUAGEDIR.e_LANGUAGE."/lan_error.php"); require_once(e_LANGUAGEDIR.e_LANGUAGE."/lan_error.php");
$text = e107::getMessage()->setTitle(LAN_ERROR_7, E_MESSAGE_INFO)->addInfo("Perhaps you're looking for one of the news items below?")->render(); $text = e107::getMessage()->setTitle(LAN_ERROR_7, E_MESSAGE_INFO)->addInfo(LAN_NEWS_308)->render(); // Perhaps you're looking for one of the news items below?
$this->action = 'all'; $this->action = 'all';
// $defaultUrl = e107::getUrl()->create('news/list/items');
$text .= $this->renderListTemplate(); $text .= $this->renderListTemplate();
return $text; return $text;
} }