oldkid/friendica
1
0
Fork 0
mirror of https://git.sekbaer.de/Friendica/friendica.git synced 2025-06-10 17:14:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/develop' into 1612-unused-indexes

Browse source
This commit is contained in:
Michael 2017-01-07 16:13:57 +00:00
commit ed0143c9f0
162 changed files with 766 additions and 683 deletions
Download patch file Download diff file Expand all files Collapse all files

9
boot.php
View file

@ -1540,7 +1540,7 @@ function check_db() {
* Sets the base url for use in cmdline programs which don't have
* $_SERVER variables
*/
function check_url(&$a) {
function check_url(App &$a) {
$url = get_config('system','url');
@ -1562,7 +1562,7 @@ function check_url(&$a) {
/**
* @brief Automatic database updates
*/
function update_db(&$a) {
function update_db(App &$a) {
$build = get_config('system','build');
if(! x($build))
$build = set_config('system','build',DB_UPDATE_VERSION);
@ -1678,7 +1678,7 @@ function run_update_function($x) {
* @param App $a
*
*/
function check_plugins(&$a) {
function check_plugins(App &$a) {
$r = q("SELECT * FROM `addon` WHERE `installed` = 1");
if (dbm::is_result($r))
@ -2413,7 +2413,8 @@ function get_temppath() {
return("");
}
function set_template_engine(&$a, $engine = 'internal') {
/// @deprecated
function set_template_engine(App &$a, $engine = 'internal') {
/// @note This function is no longer necessary, but keep it as a wrapper to the class method
/// to avoid breaking themes again unnecessarily