diff options
| author | friendica <info@friendica.com> | 2015-03-15 15:36:01 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-03-15 15:36:01 -0700 |
| commit | 6537a65053f456870e6f03cdb5bca9a9907426eb (patch) | |
| tree | 91d6bddd3aad56870d80933096c42603557c414e | |
| parent | cc2c7bbcd89bf3b937b1248519d23bde1179190f (diff) | |
| download | volse-hubzilla-6537a65053f456870e6f03cdb5bca9a9907426eb.tar.gz volse-hubzilla-6537a65053f456870e6f03cdb5bca9a9907426eb.tar.bz2 volse-hubzilla-6537a65053f456870e6f03cdb5bca9a9907426eb.zip | |
mysql schema typo, do the install check for store before chcking smarty, as that is where the dir is created, change install doc to point to install/schema_xxxxx.sql instead of database.sql
| -rw-r--r-- | install/INSTALL.txt | 4 | ||||
| -rw-r--r-- | install/schema_mysql.sql | 2 | ||||
| -rwxr-xr-x | mod/setup.php | 4 | ||||
| -rw-r--r-- | version.inc | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/install/INSTALL.txt b/install/INSTALL.txt index d042f34ec..36d112086 100644 --- a/install/INSTALL.txt +++ b/install/INSTALL.txt @@ -154,8 +154,8 @@ website. If not, edit htconfig.php and change system settings. Rename to .htconfig.php - Database is populated. - If not, import the contents of "database.sql" with phpmyadmin - or mysql command line + If not, import the contents of "install/schema_xxxxx.sql" with phpmyadmin + or mysql command line (replace 'xxxxx' with your DB type). 7. At this point visit your website again, and register your personal account. Registration errors should all be recoverable automatically. diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql index 3567085ce..b3f992500 100644 --- a/install/schema_mysql.sql +++ b/install/schema_mysql.sql @@ -34,7 +34,7 @@ CREATE TABLE IF NOT EXISTS `abook` ( KEY `abook_dob` (`abook_dob`), KEY `abook_connected` (`abook_connected`), KEY `abook_rating` (`abook_rating`), - KEY `abook_channel_closeness` (`book_channel`,`abook_closeness`) + KEY `abook_channel_closeness` (`abook_channel`,`abook_closeness`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- -------------------------------------------------------- diff --git a/mod/setup.php b/mod/setup.php index adcbbef16..b885388be 100755 --- a/mod/setup.php +++ b/mod/setup.php @@ -233,10 +233,10 @@ function setup_content(&$a) { check_htconfig($checks); - check_smarty3($checks); - check_store($checks); + check_smarty3($checks); + check_keys($checks); if(x($_POST,'phpath')) diff --git a/version.inc b/version.inc index f31eec023..39ff03a5d 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-03-14.971 +2015-03-15.972 |