Let's go 1.2

diff --git a/docs/NEWS b/docs/NEWS
index 4789a62ea22189bbfb4a570fa381dd02b1d0ffe6..7b33c57a36062761fe17992616a15c2567effebf 100644 (file)
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -1,5 +1,11 @@
 # $Id$
 
+Version 1.2 ()
+------------------------------------------------------------------------
+
+    * Introduce '%lowertitle%' permalink attribute to use lowercase
+      permalinks. (garvinhicking)
+
 Version 1.1 ()
 ------------------------------------------------------------------------
 

diff --git a/include/functions_permalinks.inc.php b/include/functions_permalinks.inc.php
index 85680a04c5124ace4644c4281aa90a9468729b65..1aa254682ab53ca022dfef0cbdbf7a46ba50167d 100644 (file)
--- a/include/functions_permalinks.inc.php
+++ b/include/functions_permalinks.inc.php
@@ -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);

diff --git a/serendipity_config.inc.php b/serendipity_config.inc.php
index 72e2d6582d117423da3f10b8975d471aeef813a0..f67b317a64fc031037eb6c8c08a7fa35191e69b5 100644 (file)
--- a/serendipity_config.inc.php
+++ b/serendipity_config.inc.php
@@ -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);