X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=application%2FApplicationUtils.php;h=7f963e9786cc50901863789341bc802ed1e22403;hb=7af9a41881ed0b9d44d18a0ce03a123a8441adf5;hp=e67b29021504ccada967da6dea47d191aa5f6b67;hpb=ceeb8fbeb89f69e41791ae192d073d6afea00f4b;p=github%2Fshaarli%2FShaarli.git diff --git a/application/ApplicationUtils.php b/application/ApplicationUtils.php index e67b2902..7f963e97 100644 --- a/application/ApplicationUtils.php +++ b/application/ApplicationUtils.php @@ -15,6 +15,9 @@ class ApplicationUtils * * The code is read from the raw content of the version file on the Git server. * + * @param string $url URL to reach to get the latest version. + * @param int $timeout Timeout to check the URL (in seconds). + * * @return mixed the version code from the repository if available, else 'false' */ public static function getLatestGitVersionCode($url, $timeout=2) @@ -49,6 +52,7 @@ class ApplicationUtils * @param int $checkInterval the minimum interval between update checks (in seconds * @param bool $enableCheck whether to check for new versions * @param bool $isLoggedIn whether the user is logged in + * @param string $branch check update for the given branch * * @throws Exception an invalid branch has been set for update checks * @@ -152,7 +156,7 @@ class ApplicationUtils } } - // Check cache and data directories are readable and writeable + // Check cache and data directories are readable and writable foreach (array( $conf->get('resource.thumbnails_cache'), $conf->get('resource.data_dir'), @@ -167,7 +171,7 @@ class ApplicationUtils } } - // Check configuration files are readable and writeable + // Check configuration files are readable and writable foreach (array( $conf->getConfigFileExt(), $conf->get('resource.datastore'),