mbirth/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

Fix conflicts.

Browse Source 
Merge branch '2.0' of github.com:s9y/Serendipity into 2.0

Conflicts:
	docs/NEWS
This commit is contained in:
Garvin Hicking
2014-12-19 09:56:10 +01:00
parent c8e147874b dc6d32bf68
commit 2f631807fe
4 changed files with 33 additions and 11 deletions

2
docs/NEWS

@ -6,6 +6,8 @@ Version 2.0-rc1 (includes beta4/5/6) (December 19th, 2014)
* entryproperties plugin will not automatically disable nl2br
markup, when the WYSIWYG editor is used to create en entry
* PHP Requirement now is at: PHP 5.3+
* Fix for syndication subtome onclick handler
* Fix problematic preview stylesheet reference

18
include/functions.inc.php

@ -1205,5 +1205,23 @@ function serendipity_db_time() {
return $ts;
}
/* Inits the logger.
* @return null
*/
function serendipity_initLog() {
global $serendipity;
if (isset($serendipity['logLevel']) && $serendipity['logLevel'] !== 'Off') {
if ($serendipity['logLevel'] == 'debug') {
$log_level = Psr\Log\LogLevel::DEBUG;
} else {
$log_level = Psr\Log\LogLevel::ERROR;
}
$serendipity['logger'] = new Katzgrau\KLogger\Logger($serendipity['serendipityPath'] . '/templates_c/logs', $log_level);
}
}
define("serendipity_FUNCTIONS_LOADED", true);
/* vim: set sts=4 ts=4 expandtab : */

7
plugins/serendipity_event_entryproperties/serendipity_event_entryproperties.php

@ -15,7 +15,7 @@ class serendipity_event_entryproperties extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_ENTRYPROPERTIES_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Garvin Hicking');
$propbag->add('version', '1.34');
$propbag->add('version', '1.35');
$propbag->add('requirements', array(
'serendipity' => '0.8',
'smarty' => '2.6.7',
@ -418,7 +418,10 @@ class serendipity_event_entryproperties extends serendipity_event
} else {
$selected = false;
}
// automatically mark nl2br markup parser as disabled, when WYSIWYG is active
if (!$selected && $serendipity['wysiwyg'] && $plugin_data['p']->act_pluginPath == 'serendipity_event_nl2br') {
$selected = true;
}
echo '<option ' . ($selected ? 'selected="selected"' : '') . ' value="' . $plugin_data['p']->instance . '">' . serendipity_specialchars($plugin_data['p']->title) . '</option>' . "\n";
}
}

17
serendipity_config.inc.php

@ -184,6 +184,13 @@ $serendipity['charsets'] = array(
@define('VIEWMODE_THREADED', 'threaded');
@define('VIEWMODE_LINEAR', 'linear');
if (!version_compare(phpversion(), '5.3', '>=')) {
$serendipity['lang'] = 'en';
include(S9Y_INCLUDE_PATH . 'include/lang.inc.php');
serendipity_die(sprintf(SERENDIPITY_PHPVERSION_FAIL, phpversion(), '5.3'));
}
/*
* Kill the script if we are not installed, and not inside the installer
*/
@ -310,15 +317,7 @@ if (defined('USE_MEMSNAP')) {
serendipity_load_configuration();
$serendipity['lang'] = serendipity_getSessionLanguage();
if (isset($serendipity['logLevel']) && $serendipity['logLevel'] !== 'Off') {
if ($serendipity['logLevel'] == 'debug') {
$log_level = Psr\Log\LogLevel::DEBUG;
} else {
$log_level = Psr\Log\LogLevel::ERROR;
}
$serendipity['logger'] = new Katzgrau\KLogger\Logger($serendipity['serendipityPath'] . '/templates_c/logs', $log_level);
}
serendipity_initLog();
if ( (isset($serendipity['autodetect_baseURL']) && serendipity_db_bool($serendipity['autodetect_baseURL'])) ||
(isset($serendipity['embed']) && serendipity_db_bool($serendipity['embed'])) ) {