diff --git a/.gitignore b/.gitignore index 0c3eb9c..2035f09 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ manager/includes/config.inc.php +manager/ht.access +manager/ht.access diff --git a/README.md b/README.md index d33052b..6d2b13b 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,13 @@ # Etomite -**Upgrade to `master` branch with Texy!:** +**Manual upgrade to `master` branch with Texy!** - SQL script: ```sql ALTER TABLE `etomite_site_content` ADD `texy` mediumtext collate utf8_unicode_ci NOT NULL; UPDATE etomite_site_content SET texy = content WHERE 1 = 1; +UPDATE etomite_system_settings SET setting_value = 0 WHERE setting_name = 'use_captcha'; ``` +- File: `manager\includes\config.inc.php`, add at line 18: `$database_server_port = "3308";` **Texy! (Texyla, FSHL)** - Texy! (syntax): https://texy.info @@ -13,7 +15,7 @@ UPDATE etomite_site_content SET texy = content WHERE 1 = 1; - FSHL (fast syntax highlighter): https://github.com/kukulich/fshl **History:** -- 2017-10-13: Manual merge with *Texyla* branch (support for Texy!, Taxyla 0.6.1, FSHL), +- 2017-10-13: Manual merge with `Texyla` branch (support for Texy! 0.6.1, Taxyla, FSHL) - 2017-10-05: Fix: `mysqli_escape_string()` and `mysqli_insert_id()` - 2017-06-02: Fix: port for PHP 7 and MySQL 5.7 - 2010-11-29: Fix: PHP 5.3, first release by Matej Kolesár diff --git a/manager/ht.access b/manager/ht.access index b0e37d7..b396b5b 100644 --- a/manager/ht.access +++ b/manager/ht.access @@ -1 +1,5 @@ -RewriteEngine Off \ No newline at end of file +RewriteEngine Off + +order deny,allow +deny from all +allow from 195.12.150.4 \ No newline at end of file