From 02f206a68b48636dad9852f6e042cddf8504a395 Mon Sep 17 00:00:00 2001
From: rurban <rurban@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Fri, 21 Jan 2005 11:51:22 +0000
Subject: [PATCH] changed (c)

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@4402 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/CachedMarkup.php |  5 +++--
 lib/Theme.php        |  7 +++++--
 lib/stdlib.php       | 29 ++++++++++++++++++++++++++---
 3 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/lib/CachedMarkup.php b/lib/CachedMarkup.php
index 191df8d23..ad7cc1a4a 100644
--- a/lib/CachedMarkup.php
+++ b/lib/CachedMarkup.php
@@ -1,6 +1,7 @@
 <?php 
-rcs_id('$Id: CachedMarkup.php,v 1.30 2005-01-20 10:13:45 rurban Exp $');
-/* Copyright (C) 2002, Geoffrey T. Dairiki <dairiki@dairiki.org>
+rcs_id('$Id: CachedMarkup.php,v 1.31 2005-01-21 11:51:22 rurban Exp $');
+/* Copyright (C) 2002 Geoffrey T. Dairiki <dairiki@dairiki.org>
+ * Copyright (C) 2004, 2005 $ThePhpWikiProgrammingTeam
  *
  * This file is part of PhpWiki.
  * 
diff --git a/lib/Theme.php b/lib/Theme.php
index 0ee6c6216..801e974a4 100644
--- a/lib/Theme.php
+++ b/lib/Theme.php
@@ -1,5 +1,5 @@
-<?php rcs_id('$Id: Theme.php,v 1.121 2005-01-20 10:14:37 rurban Exp $');
-/* Copyright (C) 2002,2004 $ThePhpWikiProgrammingTeam
+<?php rcs_id('$Id: Theme.php,v 1.122 2005-01-21 11:51:22 rurban Exp $');
+/* Copyright (C) 2002,2004,2005 $ThePhpWikiProgrammingTeam
  *
  * This file is part of PhpWiki.
  * 
@@ -1398,6 +1398,9 @@ function listAvailableLanguages() {
 }
 
 // $Log: not supported by cvs2svn $
+// Revision 1.121  2005/01/20 10:14:37  rurban
+// rel=nofollow on edit/create page links
+//
 // Revision 1.120  2004/12/20 13:20:23  rurban
 // fix problem described in patch #1088131. SidebarBox may be used before lib/WikiPlugin.php
 // is loaded.
diff --git a/lib/stdlib.php b/lib/stdlib.php
index 04a6c704c..6d3c52f0c 100644
--- a/lib/stdlib.php
+++ b/lib/stdlib.php
@@ -1,4 +1,23 @@
-<?php //rcs_id('$Id: stdlib.php,v 1.228 2005-01-17 20:28:30 rurban Exp $');
+<?php //rcs_id('$Id: stdlib.php,v 1.229 2005-01-21 11:51:22 rurban Exp $');
+/*
+ Copyright 1999,2000,2001,2002,2004,2005 $ThePhpWikiProgrammingTeam
+
+ This file is part of PhpWiki.
+
+ PhpWiki is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ PhpWiki is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with PhpWiki; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 /*
   Standard functions for Wiki functionality
@@ -1756,8 +1775,8 @@ function firstNWordsOfContent( $n, $content ) {
     if ($content and $n > 0) {
     	if (is_array($content)) {
     	    // fixme: return a list of lines then?
-    	    $content = join("\n", $content);
-            $return_array = true;
+    	    //$content = join("\n", $content);
+            //$return_array = true;
             $wordcount = 0;
             foreach ($content as $line) {
                 $words = explode(' ', $line);
@@ -1863,6 +1882,10 @@ function printSimpleTrace($bt) {
 }
 
 // $Log: not supported by cvs2svn $
+// Revision 1.228  2005/01/17 20:28:30  rurban
+// Allow more pagename chars: Limit only on certain backends.
+// Re-Allow : and ; and control chars on non-file backends.
+//
 // Revision 1.227  2005/01/14 18:32:08  uckelman
 // ConvertOldMarkup did not properly handle links containing pairs of pairs
 // of underscores. (E.g., [http://example.com/foo__bar__.html] would be
-- 
2.45.0