Merge branch 'master' into tiny-oop
This commit is contained in:
commit
9497602484
|
@ -1,6 +1,7 @@
|
||||||
*.php usr/share/tt-rss/www/
|
*.php usr/share/tt-rss/www/
|
||||||
*.css usr/share/tt-rss/www/
|
*.css usr/share/tt-rss/www/
|
||||||
*.js usr/share/tt-rss/www/
|
js usr/share/tt-rss/www/
|
||||||
|
include usr/share/tt-rss/www/
|
||||||
*.xsl usr/share/tt-rss/www/
|
*.xsl usr/share/tt-rss/www/
|
||||||
api usr/share/tt-rss/www
|
api usr/share/tt-rss/www
|
||||||
help usr/share/tt-rss/www/
|
help usr/share/tt-rss/www/
|
||||||
|
|
|
@ -40,7 +40,7 @@ case "$1" in
|
||||||
dbc_generate_include_perms="0640"
|
dbc_generate_include_perms="0640"
|
||||||
dbc_go $PACKAGE $@
|
dbc_go $PACKAGE $@
|
||||||
|
|
||||||
echo "Install ok on http://localhost/tt-rss/tt-rss.php"
|
echo "Install ok on http://localhost/tt-rss/"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
abort-upgrade|abort-remove|abort-deconfigure)
|
abort-upgrade|abort-remove|abort-deconfigure)
|
||||||
|
|
|
@ -40,7 +40,7 @@ case "$1" in
|
||||||
dbc_generate_include_perms="0640"
|
dbc_generate_include_perms="0640"
|
||||||
dbc_go $PACKAGE $@
|
dbc_go $PACKAGE $@
|
||||||
|
|
||||||
echo "Install ok on http://localhost/tt-rss/tt-rss.php"
|
echo "Install ok on http://localhost/tt-rss/"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
abort-upgrade|abort-remove|abort-deconfigure)
|
abort-upgrade|abort-remove|abort-deconfigure)
|
||||||
|
|
|
@ -1,15 +1,15 @@
|
||||||
<?php
|
<?php
|
||||||
require_once "functions.php";
|
require_once "functions.php";
|
||||||
|
|
||||||
define('EXPECTED_CONFIG_VERSION', 23);
|
|
||||||
define('SCHEMA_VERSION', 86);
|
|
||||||
|
|
||||||
if (!file_exists("config.php")) {
|
if (!file_exists("config.php")) {
|
||||||
print "<b>Fatal Error</b>: You forgot to copy
|
print "<b>Fatal Error</b>: You forgot to copy
|
||||||
<b>config.php-dist</b> to <b>config.php</b> and edit it.\n";
|
<b>config.php-dist</b> to <b>config.php</b> and edit it.\n";
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
define('EXPECTED_CONFIG_VERSION', 23);
|
||||||
|
define('SCHEMA_VERSION', 86);
|
||||||
|
|
||||||
require_once "config.php";
|
require_once "config.php";
|
||||||
require_once "sanity_config.php";
|
require_once "sanity_config.php";
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,10 @@
|
||||||
<?php
|
<?php
|
||||||
|
if (!file_exists("config.php")) {
|
||||||
|
print "<b>Fatal Error</b>: You forgot to copy
|
||||||
|
<b>config.php-dist</b> to <b>config.php</b> and edit it.\n";
|
||||||
|
exit;
|
||||||
|
}
|
||||||
|
|
||||||
set_include_path(get_include_path() . PATH_SEPARATOR . "include");
|
set_include_path(get_include_path() . PATH_SEPARATOR . "include");
|
||||||
|
|
||||||
require_once "functions.php";
|
require_once "functions.php";
|
||||||
|
|
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
|
@ -1,6 +1,6 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
DESTINATION="sanity_config.php"
|
DESTINATION="include/sanity_config.php"
|
||||||
|
|
||||||
echo "<?php # This file has been generated at: " `date` > $DESTINATION
|
echo "<?php # This file has been generated at: " `date` > $DESTINATION
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue