Version 4.7.6
This commit is contained in:
1 parent
8ba7d43898
commit
7b7404e741
1085 files changed
+30590
-7837
No files matched your search
+11
-5
@@ -3859,13 +3859,17 @@ EOF;
|
||||
'core_theme_css',
|
||||
array( 'css_set_id=?', $this->id )
|
||||
)->setKeyField('bit_key') );
|
||||
|
||||
|
||||
$masterTemplateBits = \IPS\Theme::master()->getRawTemplates();
|
||||
|
||||
/* Find changed and new template bits */
|
||||
foreach( $results['templates'] as $key => $data )
|
||||
{
|
||||
$data['added'] = false;
|
||||
$data['deleted'] = false;
|
||||
|
||||
|
||||
$masterSetTemplate = $masterTemplateBits[$data['template_app']][$data['template_location']][$data['template_group']][$data['template_name']] ?? NULL;
|
||||
|
||||
if ( isset( $history['template'][ $key ] ) )
|
||||
{
|
||||
$data['oldHumanVersion'] = \IPS\Application::load( $history['template'][ $key ]['content_app'] )->getHumanVersion( $history['template'][ $key ]['content_long_version'] );
|
||||
@@ -3882,6 +3886,10 @@ EOF;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
else if ( $masterSetTemplate and md5( $masterSetTemplate['template_content'] ) != md5( $data['template_content'] ) )
|
||||
{
|
||||
$data['diff'] = \Diff::toTable( \Diff::compare( $masterSetTemplate['template_content'], $data['template_content'] ) );
|
||||
}
|
||||
else
|
||||
{
|
||||
$data['added'] = true;
|
||||
@@ -4685,9 +4693,7 @@ EOF;
|
||||
if( $functionName == 'theme_core_front_global_footer' or ( $functionName == 'footer' and $app == 'core' and $location == 'front' and $group == 'global' ) )
|
||||
{
|
||||
$content = $content . "\n<p id='elCopyright'>
|
||||
<span id='elCopyright_userLine'>{lang=\"copyright_line_value\"}</span>
|
||||
<a rel='nofollow' title='Invision Community' href='https://www.invisioncommunity.com/'>Powered by Invision Community</a><br><a href='https://ipbmafia.ru' style='display:none'>Поддержка Invision Community в России</a>
|
||||
</p>";
|
||||
<span id='elCopyright_userLine'>{lang=\"copyright_line_value\"}</span></p>";
|
||||
}
|
||||
|
||||
/* Parse out {{code}} tags */
|
||||
|
||||
Reference in new issue
Block a user