Let's go 1.2

This commit is contained in:
Garvin Hicking 2006-12-06 14:57:17 +00:00
parent 13ca05585a
commit 41e94b2d5f
3 changed files with 15 additions and 5 deletions

View File

@ -1,5 +1,11 @@
# $Id$
Version 1.2 ()
------------------------------------------------------------------------
* Introduce '%lowertitle%' permalink attribute to use lowercase
permalinks. (garvinhicking)
Version 1.1 ()
------------------------------------------------------------------------

View File

@ -505,7 +505,7 @@ function serendipity_rewriteURL($path, $key='baseURL', $forceNone = false) {
*/
function serendipity_makePermalink($format, $data, $type = 'entry') {
global $serendipity;
static $entryKeys = array('%id%', '%title%', '%day%', '%month%', '%year%');
static $entryKeys = array('%id%', '%lowertitle%', '%title%', '%day%', '%month%', '%year%');
static $authorKeys = array('%id%', '%username%', '%realname%', '%email%');
static $categoryKeys = array('%id%', '%name%', '%description%');
@ -523,10 +523,14 @@ function serendipity_makePermalink($format, $data, $type = 'entry') {
$ts = serendipity_serverOffsetHour($data['entry']['timestamp']);
$ftitle = serendipity_makeFilename($data['title']),
$fltitle = strtolower($ftitle);
$replacements =
array(
(int)$data['id'],
serendipity_makeFilename($data['title']),
$fltitle,
$ftitle,
date('d', $ts),
date('m', $ts),
date('Y', $ts)
@ -568,8 +572,8 @@ function serendipity_makePermalink($format, $data, $type = 'entry') {
* @return string The regular expression to a permalink URL
*/
function serendipity_makePermalinkRegex($format, $type = 'entry') {
static $entryKeys = array('%id%', '%title%', '%day%', '%month%', '%year%');
static $entryRegexValues = array('([0-9]+)', PAT_FILENAME_MATCH, '[0-9]{1,2}', '[0-9]{1,2}', '[0-9]{4}');
static $entryKeys = array('%id%', '%lowertitle%', '%title%', '%day%', '%month%', '%year%');
static $entryRegexValues = array('([0-9]+)', PAT_FILENAME_MATCH, PAT_FILENAME_MATCH, '[0-9]{1,2}', '[0-9]{1,2}', '[0-9]{4}');
static $authorKeys = array('%id%', '%username%', '%realname%', '%email%');
static $authorRegexValues = array('([0-9]+)', PAT_FILENAME_MATCH, PAT_FILENAME_MATCH, PAT_FILENAME_MATCH);

View File

@ -31,7 +31,7 @@ if (!defined('IN_serendipity')) {
include(S9Y_INCLUDE_PATH . 'include/compat.inc.php');
// The version string
$serendipity['version'] = '1.1-beta6';
$serendipity['version'] = '1.2-alpha1';
// Setting this to 'false' will enable debugging output. All alpa/beta/cvs snapshot versions will emit debug information by default. To increase the debug level (to enable Smarty debugging), set this flag to 'debug'.
$serendipity['production'] = (preg_match('@\-(alpha|beta|cvs)@', $serendipity['version']) ? false : true);