Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #981 from mark-gerarts/default-note-title

Browse source 
Allow setting of a default note title, see #963
This commit is contained in:
VirtualTam 2017-10-03 19:26:48 +02:00 committed by GitHub
commit 2f69b6d04e
3 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
application/config/ConfigManager.php
View file

@ -317,6 +317,7 @@ protected function setDefaultValues()
$this->setEmpty('general.header_link', '?'); $this->setEmpty('general.header_link', '?');
$this->setEmpty('general.links_per_page', 20); $this->setEmpty('general.links_per_page', 20);
$this->setEmpty('general.enabled_plugins', self::$DEFAULT_PLUGINS); $this->setEmpty('general.enabled_plugins', self::$DEFAULT_PLUGINS);
$this->setEmpty('general.default_note_title', 'Note: ');
$this->setEmpty('updates.check_updates', false); $this->setEmpty('updates.check_updates', false);
$this->setEmpty('updates.check_updates_branch', 'stable'); $this->setEmpty('updates.check_updates_branch', 'stable');

1
doc/md/Shaarli-configuration.md
View file

@ -55,6 +55,7 @@ _These settings should not be edited_
- **links_per_page**: Number of shaares displayed per page. - **links_per_page**: Number of shaares displayed per page.
- **timezone**: See [the list of supported timezones](http://php.net/manual/en/timezones.php). - **timezone**: See [the list of supported timezones](http://php.net/manual/en/timezones.php).
- **enabled_plugins**: List of enabled plugins. - **enabled_plugins**: List of enabled plugins.
- **default_note_title**: Default title of a new note.
### Security ### Security

2
index.php
View file

@ -1443,7 +1443,7 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history)
if ($url == '') { if ($url == '') {
$url = '?' . smallHash($linkdate . $LINKSDB->getNextId()); $url = '?' . smallHash($linkdate . $LINKSDB->getNextId());
$title = 'Note: '; $title = $conf->get('general.default_note_title', 'Note: ');
} }
$url = escape($url); $url = escape($url);
$title = escape($title); $title = escape($title);