From: Penny Leach <penny@titania.local>
Date: Fri, 29 Jun 2007 22:43:15 +0000 (+1200)
Subject: Merge commit 'origin/1.0' into sgn-1.0
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=91d2916315077347bf13a2b958e68731f61b2c07;p=s9y.git

Merge commit 'origin/1.0' into sgn-1.0

Conflicts:

	include/functions_permalinks.inc.php
---

91d2916315077347bf13a2b958e68731f61b2c07
diff --cc include/functions_permalinks.inc.php
index cdb1370,324c3cd..a431b9b
--- a/include/functions_permalinks.inc.php
+++ b/include/functions_permalinks.inc.php
@@@ -272,12 -258,9 +276,12 @@@ function serendipity_initPermalinks() 
   */
  function &serendipity_permalinkPatterns($return = false) {
      global $serendipity;
-     
+ 
      $PAT = array();
  
 +    $PAT['ABOUT']                    = '@/'  . $serendipity['permalinkAboutPath'];
 +    $PAT['BREAKFAST']                    = '@/'  . $serendipity['permalinkBreakfastPath'];
 +    $PAT['GALLERY']                  = '@/'  . $serendipity['permalinkGalleryPath'];
      $PAT['UNSUBSCRIBE']              = '@/'  . $serendipity['permalinkUnsubscribePath'].'/(.*)/([0-9]+)@';
      $PAT['APPROVE']                  = '@/'  . $serendipity['permalinkApprovePath'].'/(.*)/(.*)/([0-9]+)@';
      $PAT['DELETE']                   = '@/'  . $serendipity['permalinkDeletePath'].'/(.*)/(.*)/([0-9]+)@';
diff --cc serendipity_config.inc.php
index 06f77e7,c34aa81..b377e42
--- a/serendipity_config.inc.php
+++ b/serendipity_config.inc.php
@@@ -12,9 -12,9 +12,9 @@@ if (!defined('S9Y_INCLUDE_PATH')) 
  define('S9Y_CONFIG_TEMPLATE',     S9Y_INCLUDE_PATH . 'include/tpl/config_local.inc.php');
  define('S9Y_CONFIG_USERTEMPLATE', S9Y_INCLUDE_PATH . 'include/tpl/config_personal.inc.php');
  
 -define('IS_installed', file_exists('serendipity_config_local.inc.php') && (filesize('serendipity_config_local.inc.php') > 0));
 +define('IS_installed', file_exists(dirname(__FILE__).'/serendipity_config_local.inc.php') && (filesize(dirname(__FILE__).'/serendipity_config_local.inc.php') > 0));
  
- if (IS_installed === true && !defined('IN_serendipity')) {
+ if (!defined('IN_serendipity')) {
      define('IN_serendipity', true);
  }