[geeklog-cvs] geeklog: Added a note to copy over config.php files when upgradi...

[geeklog-cvs at lists.geeklog.net]

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/ed62fb68fc81
changeset: 6675:ed62fb68fc81
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Jan 11 09:07:58 2009 +0100
description:
Added a note to copy over config.php files when upgrading from versions older than 1.5.0

diffstat:

8 files changed, 8 insertions(+), 8 deletions(-)
public_html/admin/install/language/chinese_simplified_utf-8.php  |    2 +-
public_html/admin/install/language/chinese_traditional_utf-8.php |    2 +-
public_html/admin/install/language/english.php                   |    2 +-
public_html/admin/install/language/german.php                    |    2 +-
public_html/admin/install/language/hebrew_utf-8.php              |    2 +-
public_html/admin/install/language/japanese_utf-8.php            |    2 +-
public_html/admin/install/language/polish.php                    |    2 +-
public_html/admin/install/migrate.php                            |    2 +-

diffs (97 lines):

diff -r a6ae19468150 -r ed62fb68fc81 public_html/admin/install/language/chinese_simplified_utf-8.php
--- a/public_html/admin/install/language/chinese_simplified_utf-8.php	Sat Jan 10 22:31:06 2009 +0100
+++ b/public_html/admin/install/language/chinese_simplified_utf-8.php	Sun Jan 11 09:07:58 2009 +0100
@@ -194,7 +194,7 @@
     1 => 'Before Proceding',
     2 => 'Be sure any previously installed plugins have been copied to your new server.',
     3 => 'Be sure any images from <code>public_html/images/articles/</code>, <code>public_html/images/topics/</code>, and <code>public_html/images/userphotos/</code>, have been copied to your new server.',
-    4 => 'If you\'re upgrading to a new Geeklog version, then run the <a href="index.php">install script</a> in upgrade mode first.',
+    4 => 'If you\'re upgrading from a Geeklog version older than <strong>1.5.0</strong>, then make sure to copy over all your old <tt>config.php</tt> files so that the migration can pick up your settings.',
     5 => 'If you\'re upgrading to a new Geeklog version, then don\'t upload your theme just yet. Use the included default theme until you can be sure your migrated site works properly.',
     6 => 'Select an existing backup',
     7 => 'Choose file...',
diff -r a6ae19468150 -r ed62fb68fc81 public_html/admin/install/language/chinese_traditional_utf-8.php
--- a/public_html/admin/install/language/chinese_traditional_utf-8.php	Sat Jan 10 22:31:06 2009 +0100
+++ b/public_html/admin/install/language/chinese_traditional_utf-8.php	Sun Jan 11 09:07:58 2009 +0100
@@ -194,7 +194,7 @@
     1 => 'Before Proceding',
     2 => 'Be sure any previously installed plugins have been copied to your new server.',
     3 => 'Be sure any images from <code>public_html/images/articles/</code>, <code>public_html/images/topics/</code>, and <code>public_html/images/userphotos/</code>, have been copied to your new server.',
-    4 => 'If you\'re upgrading to a new Geeklog version, then run the <a href="index.php">install script</a> in upgrade mode first.',
+    4 => 'If you\'re upgrading from a Geeklog version older than <strong>1.5.0</strong>, then make sure to copy over all your old <tt>config.php</tt> files so that the migration can pick up your settings.',
     5 => 'If you\'re upgrading to a new Geeklog version, then don\'t upload your theme just yet. Use the included default theme until you can be sure your migrated site works properly.',
     6 => 'Select an existing backup',
     7 => 'Choose file...',
diff -r a6ae19468150 -r ed62fb68fc81 public_html/admin/install/language/english.php
--- a/public_html/admin/install/language/english.php	Sat Jan 10 22:31:06 2009 +0100
+++ b/public_html/admin/install/language/english.php	Sun Jan 11 09:07:58 2009 +0100
@@ -194,7 +194,7 @@
     1 => 'Before Proceding',
     2 => 'Be sure any previously installed plugins have been copied to your new server.',
     3 => 'Be sure any images from <code>public_html/images/articles/</code>, <code>public_html/images/topics/</code>, and <code>public_html/images/userphotos/</code>, have been copied to your new server.',
-    4 => 'If you\'re upgrading to a new Geeklog version, then run the <a href="index.php">install script</a> in upgrade mode first.',
+    4 => 'If you\'re upgrading from a Geeklog version older than <strong>1.5.0</strong>, then make sure to copy over all your old <tt>config.php</tt> files so that the migration can pick up your settings.',
     5 => 'If you\'re upgrading to a new Geeklog version, then don\'t upload your theme just yet. Use the included default theme until you can be sure your migrated site works properly.',
     6 => 'Select an existing backup',
     7 => 'Choose file...',
diff -r a6ae19468150 -r ed62fb68fc81 public_html/admin/install/language/german.php
--- a/public_html/admin/install/language/german.php	Sat Jan 10 22:31:06 2009 +0100
+++ b/public_html/admin/install/language/german.php	Sun Jan 11 09:07:58 2009 +0100
@@ -194,7 +194,7 @@
     1 => 'Before Proceding',
     2 => 'Be sure any previously installed plugins have been copied to your new server.',
     3 => 'Be sure any images from <code>public_html/images/articles/</code>, <code>public_html/images/topics/</code>, and <code>public_html/images/userphotos/</code>, have been copied to your new server.',
-    4 => 'If you\'re upgrading to a new Geeklog version, then run the <a href="index.php">install script</a> in upgrade mode first.',
+    4 => 'If you\'re upgrading from a Geeklog version older than <strong>1.5.0</strong>, then make sure to copy over all your old <tt>config.php</tt> files so that the migration can pick up your settings.',
     5 => 'If you\'re upgrading to a new Geeklog version, then don\'t upload your theme just yet. Use the included default theme until you can be sure your migrated site works properly.',
     6 => 'Backup auswählen',
     7 => 'Datei auswählen...',
diff -r a6ae19468150 -r ed62fb68fc81 public_html/admin/install/language/hebrew_utf-8.php
--- a/public_html/admin/install/language/hebrew_utf-8.php	Sat Jan 10 22:31:06 2009 +0100
+++ b/public_html/admin/install/language/hebrew_utf-8.php	Sun Jan 11 09:07:58 2009 +0100
@@ -189,7 +189,7 @@
     1 => 'Before Proceding',
     2 => 'Be sure any previously installed plugins have been copied to your new server.',
     3 => 'Be sure any images from <code>public_html/images/articles/</code>, <code>public_html/images/topics/</code>, and <code>public_html/images/userphotos/</code>, have been copied to your new server.',
-    4 => 'If you\'re upgrading to a new Geeklog version, then run the <a href="index.php">install script</a> in upgrade mode first.',
+    4 => 'If you\'re upgrading from a Geeklog version older than <strong>1.5.0</strong>, then make sure to copy over all your old <tt>config.php</tt> files so that the migration can pick up your settings.',
     5 => 'If you\'re upgrading to a new Geeklog version, then don\'t upload your theme just yet. Use the included default theme until you can be sure your migrated site works properly.',
     6 => 'Select an existing backup',
     7 => 'Choose file...',
diff -r a6ae19468150 -r ed62fb68fc81 public_html/admin/install/language/japanese_utf-8.php
--- a/public_html/admin/install/language/japanese_utf-8.php	Sat Jan 10 22:31:06 2009 +0100
+++ b/public_html/admin/install/language/japanese_utf-8.php	Sun Jan 11 09:07:58 2009 +0100
@@ -195,7 +195,7 @@
     1 => 'Before Proceding',
     2 => 'Be sure any previously installed plugins have been copied to your new server.',
     3 => 'Be sure any images from <code>public_html/images/articles/</code>, <code>public_html/images/topics/</code>, and <code>public_html/images/userphotos/</code>, have been copied to your new server.',
-    4 => 'If you\'re upgrading to a new Geeklog version, then run the <a href="index.php">install script</a> in upgrade mode first.',
+    4 => 'If you\'re upgrading from a Geeklog version older than <strong>1.5.0</strong>, then make sure to copy over all your old <tt>config.php</tt> files so that the migration can pick up your settings.',
     5 => 'If you\'re upgrading to a new Geeklog version, then don\'t upload your theme just yet. Use the included default theme until you can be sure your migrated site works properly.',
     6 => 'Select an existing backup',
     7 => 'Choose file...',
diff -r a6ae19468150 -r ed62fb68fc81 public_html/admin/install/language/polish.php
--- a/public_html/admin/install/language/polish.php	Sat Jan 10 22:31:06 2009 +0100
+++ b/public_html/admin/install/language/polish.php	Sun Jan 11 09:07:58 2009 +0100
@@ -193,7 +193,7 @@
     1 => 'Before Proceding',
     2 => 'Be sure any previously installed plugins have been copied to your new server.',
     3 => 'Be sure any images from <code>public_html/images/articles/</code>, <code>public_html/images/topics/</code>, and <code>public_html/images/userphotos/</code>, have been copied to your new server.',
-    4 => 'If you\'re upgrading to a new Geeklog version, then run the <a href="index.php">install script</a> in upgrade mode first.',
+    4 => 'If you\'re upgrading from a Geeklog version older than <strong>1.5.0</strong>, then make sure to copy over all your old <tt>config.php</tt> files so that the migration can pick up your settings.',
     5 => 'If you\'re upgrading to a new Geeklog version, then don\'t upload your theme just yet. Use the included default theme until you can be sure your migrated site works properly.',
     6 => 'Select an existing backup',
     7 => 'Choose file...',
diff -r a6ae19468150 -r ed62fb68fc81 public_html/admin/install/migrate.php
--- a/public_html/admin/install/migrate.php	Sat Jan 10 22:31:06 2009 +0100
+++ b/public_html/admin/install/migrate.php	Sun Jan 11 09:07:58 2009 +0100
@@ -266,8 +266,8 @@
             . INST_printTab(3) . '<ul>' . LB
             . INST_printTab(4) . '<li>' . $LANG_MIGRATE[2] . '</li>' . LB
             . INST_printTab(4) . '<li>' . $LANG_MIGRATE[3] . '</li>' . LB
-            //. INST_printTab(4) . '<li>' . $LANG_MIGRATE[4] . '</li>' . LB
             . INST_printTab(4) . '<li>' . $LANG_MIGRATE[5] . '</li>' . LB
+            . INST_printTab(4) . '<li>' . $LANG_MIGRATE[4] . '</li>' . LB
             . INST_printTab(3) . '</ul>' . LB . LB;
 
         // Default form values