# HG changeset patch # User Dan # Date 1243963625 14400 # Node ID 0867b9d38c38aee569f29500b83c9a99b78493e9 # Parent ea039091d154e09290ad765665b2953620cacdd4 Enabled tiny URL scheme support in installer cli-core diff -r ea039091d154 -r 0867b9d38c38 install/includes/cli-core.php --- a/install/includes/cli-core.php Sun May 31 23:27:04 2009 -0400 +++ b/install/includes/cli-core.php Tue Jun 02 13:27:05 2009 -0400 @@ -140,7 +140,7 @@ -n, --site-name Name of site -s, --site-desc *SHORT* Description of site -c, --copyright Copyright notice shown on pages - -r, --url-scheme URL scheme (standard, short, or rewrite) + -r, --url-scheme URL scheme (standard, short, rewrite, or tiny) -l, --language Language to be used on site and in installer -i, --scriptpath Where Enano is relative to your website root (no trailing slash) @@ -296,7 +296,7 @@ break; case 'urlscheme': $temp = ''; - while ( !in_array($temp, array('standard', 'short', 'rewrite')) ) + while ( !in_array($temp, array('standard', 'short', 'rewrite', 'tiny')) ) { $temp = cli_prompt($terms[$var], $defaults[$var]); } diff -r ea039091d154 -r 0867b9d38c38 language/english/install.json --- a/language/english/install.json Sun May 31 23:27:04 2009 -0400 +++ b/language/english/install.json Tue Jun 02 13:27:05 2009 -0400 @@ -479,7 +479,7 @@ prompt_sitename: 'Site name', prompt_sitedesc: 'Site description', prompt_copyright: 'Copyright notice', - prompt_urlscheme: 'URL scheme (standard, short, or rewrite)', + prompt_urlscheme: 'URL scheme (standard, short, rewrite, or tiny)', prompt_scriptpath: 'Now we need the path to Enano, relative to your website\'s document root,\nwithout a trailing slash. This should be based on the URL your site will\nuse. For example, if your site is http://yoursite.com/enano/, use the value\n"/enano" here. Leave this blank if Enano is in your document root, e.g.\nhttp://yoursite.com/index.php?title=Enano_page.\nSite URL', prompt_confirm: 'Enter again to confirm', msg_echo_warning: '(WARNING, will be echoed)',