Browse Source

Fix config mentions (no doc)

tags/2018.09
Hypolite Petovan 1 year ago
parent
commit
3fc21f0d64
4 changed files with 8 additions and 8 deletions
  1. +3
    -3
      bin/dev/friendica-to-smarty-tpl.py
  2. +1
    -1
      src/Core/Console/AutomaticInstallation.php
  3. +2
    -2
      src/Core/Install.php
  4. +2
    -2
      util/Doxyfile

+ 3
- 3
bin/dev/friendica-to-smarty-tpl.py View File

@@ -83,7 +83,7 @@ def fix_element(element):
element += ldelim + parts[first+1].rstrip('}') + rdelim
else:
# This takes care of elements where the filename is a path, e.g. {{ inc file.tpl }}
element += parts[first+1].rstrip('}')
element += parts[first+1].rstrip('}')

element += '"'

@@ -205,7 +205,7 @@ try:
except getopt.GetoptError:
help(sys.argv[0])
sys.exit(2)

if path == '':
path = raw_input('Path to template folder to convert: ')
@@ -220,7 +220,7 @@ if not os.path.exists(outpath):

files = os.listdir(path)
for a_file in files:
if a_file == 'htconfig.tpl':
if a_file == 'local.ini.tpl':
php_tpl = True
else:
php_tpl = False

+ 1
- 1
src/Core/Console/AutomaticInstallation.php View File

@@ -121,7 +121,7 @@ HELP;

Install::checkFunctions($checks);
Install::checkImagick($checks);
Install::checkHtConfig($checks);
Install::checkLocalIni($checks);
Install::checkSmarty3($checks);
Install::checkKeys($checks);


+ 2
- 2
src/Core/Install.php View File

@@ -42,7 +42,7 @@ class Install extends BaseObject
self::checkImagick($checks);
self::checkHtConfig($checks);
self::checkLocalIni($checks);
self::checkSmarty3($checks);
@@ -308,7 +308,7 @@ class Install extends BaseObject
*
* @param array $checks The list of all checks (by-ref parameter!)
*/
public static function checkHtConfig(&$checks)
public static function checkLocalIni(&$checks)
{
$status = true;
$help = "";

+ 2
- 2
util/Doxyfile View File

@@ -2,8 +2,8 @@ INPUT = README.md index.php boot.php testargs.php update.php mod/ object/ includ
RECURSIVE = YES
PROJECT_NAME = "Friendica"
PROJECT_LOGO = images/friendica-64.jpg
EXCLUDE = .htconfig.php library/ doc/ .git/ log/ util/zotsh/easywebdav/ addon/ report/ privacy_image_cache/ photo/ proxy/ local/
EXCLUDE_PATTERNS = *smarty3* *strings.php*.log *.out *test*
EXCLUDE = .htconfig.php config/ library/ doc/ .git/ log/ util/zotsh/easywebdav/ addon/ report/ privacy_image_cache/ photo/ proxy/ local/
EXCLUDE_PATTERNS = *smarty3* *strings.php*.log *.out *test*
OUTPUT_DIRECTORY = doc
GENERATE_HTML = YES
HTML_OUTPUT = html/

Loading…
Cancel
Save