mirror of
https://github.com/friendica/friendica
synced 2025-05-01 23:04:24 +02:00
Merge branch 'master' into develop
- Updated new develop version label - Incremented database build number
This commit is contained in:
commit
93daf7883e
474 changed files with 75160 additions and 91301 deletions
|
@ -6,6 +6,7 @@ use Asika\SimpleConsole\Console;
|
|||
use dba;
|
||||
use Friendica\App;
|
||||
use Friendica\Core\Install;
|
||||
use Friendica\Core\Theme;
|
||||
|
||||
require_once 'mod/install.php';
|
||||
require_once 'include/dba.php';
|
||||
|
@ -90,6 +91,15 @@ HELP;
|
|||
|
||||
$this->out(" Complete!\n\n");
|
||||
|
||||
// Install theme
|
||||
$this->out("Installing theme\n");
|
||||
if (!empty($a->config['system']['theme'])) {
|
||||
Theme::install($a->config['system']['theme']);
|
||||
$this->out(" Complete\n\n");
|
||||
} else {
|
||||
$this->out(" Theme setting is empty. Please check the file htconfig.php\n\n");
|
||||
}
|
||||
|
||||
// Copy config file
|
||||
$this->out("Saving config file...\n");
|
||||
if ($config_file != '.htconfig.php' && !copy($config_file, '.htconfig.php')) {
|
||||
|
|
|
@ -94,6 +94,7 @@ HELP;
|
|||
$fnname = 'string_plural_select_' . $lang;
|
||||
$out .= 'if(! function_exists("' . $fnname . '")) {' . "\n";
|
||||
$out .= 'function ' . $fnname . '($n){' . "\n";
|
||||
$out .= ' $n = intval($n);' . "\n";
|
||||
$out .= ' return ' . $cond . ';' . "\n";
|
||||
$out .= '}}' . "\n";
|
||||
}
|
||||
|
|
|
@ -999,6 +999,7 @@ class Worker
|
|||
}
|
||||
|
||||
/**
|
||||
* @brief Spawns a new worker
|
||||
* @return void
|
||||
*/
|
||||
public static function spawnWorker()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue