aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMark Gerarts <mark.gerarts@gmail.com>2017-10-01 14:19:57 +0200
committerMark Gerarts <mark.gerarts@gmail.com>2017-10-01 14:19:57 +0200
commit722caa209005a23b0cfba31aa10cd34a45880cec (patch)
tree62133d2af36b2e2e195b2a473b4207a4c0e11623
parent3512f4461722c9a3c7cf6511232bda156bf91970 (diff)
downloadShaarli-722caa209005a23b0cfba31aa10cd34a45880cec.tar.gz
Shaarli-722caa209005a23b0cfba31aa10cd34a45880cec.tar.zst
Shaarli-722caa209005a23b0cfba31aa10cd34a45880cec.zip
Allow setting of a default note title, see #963
-rw-r--r--application/config/ConfigManager.php1
-rw-r--r--doc/md/Shaarli-configuration.md1
-rw-r--r--index.php2
3 files changed, 3 insertions, 1 deletions
diff --git a/application/config/ConfigManager.php b/application/config/ConfigManager.php
index 32f6ef6d..7ff2fe67 100644
--- a/application/config/ConfigManager.php
+++ b/application/config/ConfigManager.php
@@ -317,6 +317,7 @@ class ConfigManager
317 $this->setEmpty('general.header_link', '?'); 317 $this->setEmpty('general.header_link', '?');
318 $this->setEmpty('general.links_per_page', 20); 318 $this->setEmpty('general.links_per_page', 20);
319 $this->setEmpty('general.enabled_plugins', self::$DEFAULT_PLUGINS); 319 $this->setEmpty('general.enabled_plugins', self::$DEFAULT_PLUGINS);
320 $this->setEmpty('general.default_note_title', 'Note: ');
320 321
321 $this->setEmpty('updates.check_updates', false); 322 $this->setEmpty('updates.check_updates', false);
322 $this->setEmpty('updates.check_updates_branch', 'stable'); 323 $this->setEmpty('updates.check_updates_branch', 'stable');
diff --git a/doc/md/Shaarli-configuration.md b/doc/md/Shaarli-configuration.md
index 37486414..99b25ba7 100644
--- a/doc/md/Shaarli-configuration.md
+++ b/doc/md/Shaarli-configuration.md
@@ -55,6 +55,7 @@ _These settings should not be edited_
55- **links_per_page**: Number of shaares displayed per page. 55- **links_per_page**: Number of shaares displayed per page.
56- **timezone**: See [the list of supported timezones](http://php.net/manual/en/timezones.php). 56- **timezone**: See [the list of supported timezones](http://php.net/manual/en/timezones.php).
57- **enabled_plugins**: List of enabled plugins. 57- **enabled_plugins**: List of enabled plugins.
58- **default_note_title**: Default title of a new note.
58 59
59### Security 60### Security
60 61
diff --git a/index.php b/index.php
index fb00a9fa..43aab303 100644
--- a/index.php
+++ b/index.php
@@ -1443,7 +1443,7 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history)
1443 1443
1444 if ($url == '') { 1444 if ($url == '') {
1445 $url = '?' . smallHash($linkdate . $LINKSDB->getNextId()); 1445 $url = '?' . smallHash($linkdate . $LINKSDB->getNextId());
1446 $title = 'Note: '; 1446 $title = $conf->get('general.default_note_title', 'Note: ');
1447 } 1447 }
1448 $url = escape($url); 1448 $url = escape($url);
1449 $title = escape($title); 1449 $title = escape($title);