From 24bb0112d984e7e5b0e4a7f2449be50c38d7104a Mon Sep 17 00:00:00 2001
From: garvinhicking <ssh-404855-supergarv@sunfire.ispgateway.de>
Date: Mon, 15 Dec 2014 10:00:33 +0100
Subject: [PATCH 1/3] php detection
---
docs/NEWS | 2 ++
1 file changed, 2 insertions(+)
diff --git a/docs/NEWS b/docs/NEWS
index 45e047e8..568d3c51 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -3,6 +3,8 @@
Version 2.0-rc1 (includes beta4/5/6) (November 29th, 2014)
------------------------------------------------------------------------
+ * PHP Requirement now is at: PHP 5.3+
+
* Fix for syndication subtome onclick handler
* Fix problematic preview stylesheet reference
From c3d060c97366c8484c36497a16db05c18377652d Mon Sep 17 00:00:00 2001
From: garvinhicking <blog@garv.in>
Date: Mon, 15 Dec 2014 10:13:10 +0100
Subject: [PATCH 2/3] Move logger init to seperate funtion so that its PHP 5.3+
syntax does not fatally break the serendipity_config.inc.php parsing on PHP5
5.3-. Also create a reasonable error message when running on an old version.
---
include/functions.inc.php | 18 ++++++++++++++++++
serendipity_config.inc.php | 17 ++++++++---------
2 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/include/functions.inc.php b/include/functions.inc.php
index a0caf9fb..fca30d69 100644
--- a/include/functions.inc.php
+++ b/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 : */
diff --git a/serendipity_config.inc.php b/serendipity_config.inc.php
index 7c7a4ffd..0c1ee36a 100644
--- a/serendipity_config.inc.php
+++ b/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'])) ) {
From dc6d32bf6854fd5c412d6b1b4ae31c705487ffba Mon Sep 17 00:00:00 2001
From: Ian <aristophian@googlemail.com>
Date: Mon, 15 Dec 2014 16:00:45 +0100
Subject: [PATCH 3/3] automark nl2br disabled on wysiwyg usage
References s9y/Serendipity#243
---
.../serendipity_event_entryproperties.php | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/plugins/serendipity_event_entryproperties/serendipity_event_entryproperties.php b/plugins/serendipity_event_entryproperties/serendipity_event_entryproperties.php
index df2aa1b6..1b618400 100644
--- a/plugins/serendipity_event_entryproperties/serendipity_event_entryproperties.php
+++ b/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";
}
}