r31k
/
bludit
2
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Merge pull request #314 from janxb/patch-1 

Fixed PHP notice after installation and javascript translations
This commit is contained in:
Diego Najar 2016-07-29 00:54:38 +02:00 committed by GitHub
parent fae098ee6f 19cc09847d
commit a5af1ec827
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bl-kernel/admin/themes/default/init.php
View File

@ -205,11 +205,11 @@ class HTML {
public static function bluditCoverImage($coverImage="") public static function bluditCoverImage($coverImage="")
{ {
global $L;
// Javascript code // Javascript code
include(PATH_JS.'bludit-cover-image.js'); include(PATH_JS.'bludit-cover-image.js');
global $L;
$style = ''; $style = '';
if(!empty($coverImage)) { if(!empty($coverImage)) {
$style = 'background-image: url('.HTML_PATH_UPLOADS_THUMBNAILS.$coverImage.')'; $style = 'background-image: url('.HTML_PATH_UPLOADS_THUMBNAILS.$coverImage.')';
@ -263,11 +263,11 @@ class HTML {
public static function bluditImagesV8() public static function bluditImagesV8()
{ {
global $L;
// Javascript code // Javascript code
include(PATH_JS.'bludit-images-v8.js'); include(PATH_JS.'bludit-images-v8.js');
global $L;
$html = '<!-- BLUDIT IMAGES V8 -->'; $html = '<!-- BLUDIT IMAGES V8 -->';
$html .= ' $html .= '
<div id="bludit-images-v8" class="uk-modal"> <div id="bludit-images-v8" class="uk-modal">

3
bl-kernel/dbpages.class.php
View File

@ -394,7 +394,8 @@ class dbPages extends dbJSON
$checksum = md5_file(PATH_PAGES.$key.DS.FILENAME); $checksum = md5_file(PATH_PAGES.$key.DS.FILENAME);
// If checksum is different, update the post // If checksum is different, update the post
if( $this->db[$key]['md5file']!==$checksum ) { if( !isset($this->db[$key]['md5file']) ||
$this->db[$key]['md5file']!==$checksum ) {
// LOG // LOG
Log::set('CLI MODE - Different md5 checksum, key: '.$key); Log::set('CLI MODE - Different md5 checksum, key: '.$key);

2
bl-kernel/js/bludit-cover-image.js
View File

@ -85,7 +85,7 @@ $(document).ready(function() {
}, },
notallowed: function(file, settings) { notallowed: function(file, settings) {
alert("'.$L->g('Supported image file types').' "+settings.allow); alert("<?php echo $L->g('error').'. '.$L->g('Supported image file types')?>: "+settings.allow);
} }
}; };

2
bl-kernel/js/bludit-images-v8.js
View File

@ -58,7 +58,7 @@ $(document).ready(function() {
}, },
notallowed: function(file, settings) { notallowed: function(file, settings) {
alert("'.$L->g('Supported image file types').' "+settings.allow); alert("<?php echo $L->g('error').'. '.$L->g('Supported image file types')?>: "+settings.allow);
} }
}; };