diff options
| author | friendica <info@friendica.com> | 2013-05-18 01:27:14 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-05-18 01:27:14 -0700 |
| commit | 367b21f8869f462c11109ad08058aa2a6c63313a (patch) | |
| tree | a731f828a6b168d20767bd0f56131f6a6de67742 | |
| parent | f2de266ce6cfbc52288e3add070f8502fb5334d3 (diff) | |
| parent | 7a1448c64f58e8bcbc3fc8fb936c8bda64ec1a87 (diff) | |
| download | volse-hubzilla-367b21f8869f462c11109ad08058aa2a6c63313a.tar.gz volse-hubzilla-367b21f8869f462c11109ad08058aa2a6c63313a.tar.bz2 volse-hubzilla-367b21f8869f462c11109ad08058aa2a6c63313a.zip | |
Merge https://github.com/friendica/red into zpull
| -rw-r--r-- | doc/Install.md | 2 | ||||
| -rw-r--r-- | mod/profiles.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/Install.md b/doc/Install.md index 5ce6950bd..9882ff3a9 100644 --- a/doc/Install.md +++ b/doc/Install.md @@ -11,7 +11,7 @@ Before you begin: Choose a domain name or subdomain name for your server. - Apache with mod-rewrite enabled and "Options All" so you can use a local .htaccess file - - PHP 5.3 + - PHP 5.3 or later - PHP *command line* access with register_argc_argv set to true in the php.ini file - curl, gd, mysql, and openssl extensions diff --git a/mod/profiles.php b/mod/profiles.php index e7cc01b4e..ff6bc8ff6 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -447,7 +447,7 @@ function profiles_post(&$a) { $channel = $a->get_channel(); if($namechanged && $is_default) { - $r = q("UPDATE xchan SET xchan_name = '%s', xchan_name_date` = '%s' WHERE xchan_hash = '%s' limit 1", + $r = q("UPDATE xchan SET xchan_name = '%s', xchan_name_date = '%s' WHERE xchan_hash = '%s' limit 1", dbesc($name), dbesc(datetime_convert()), dbesc($channel['xchan_hash']) |