diff options
author | Paolo T <tuscanhobbit@users.noreply.github.com> | 2013-10-25 00:09:42 -0700 |
---|---|---|
committer | Paolo T <tuscanhobbit@users.noreply.github.com> | 2013-10-25 00:09:42 -0700 |
commit | b23f3fc03b6bc751aab67fe2258a21f7c65bab8e (patch) | |
tree | 84c997aa781afa566536ca5f66eb8f90ef468476 /install | |
parent | d30f718e0836a031e43d5403480aa049561e736e (diff) | |
parent | 0b0bd3c20765d267ec6d7cc261c7713917a22582 (diff) | |
download | volse-hubzilla-b23f3fc03b6bc751aab67fe2258a21f7c65bab8e.tar.gz volse-hubzilla-b23f3fc03b6bc751aab67fe2258a21f7c65bab8e.tar.bz2 volse-hubzilla-b23f3fc03b6bc751aab67fe2258a21f7c65bab8e.zip |
Merge pull request #3 from friendica/master
Align to main project HEAD
Diffstat (limited to 'install')
-rw-r--r-- | install/INSTALL.txt | 18 | ||||
-rw-r--r-- | install/database.sql | 1 | ||||
-rw-r--r-- | install/update.php | 9 |
3 files changed, 9 insertions, 19 deletions
diff --git a/install/INSTALL.txt b/install/INSTALL.txt index 3c3e795d7..ee029f0ee 100644 --- a/install/INSTALL.txt +++ b/install/INSTALL.txt @@ -103,24 +103,6 @@ directory/path component in the URL) is REQUIRED. git pull - - If you wish to use WebDAV file services - - - First you should be **on** your website folder - - cd mywebsite - - - Then you should clone the sabre-dav repository (separately) - - git clone https://github.com/fruux/sabre-dav sabre - - - For keeping the sabre tree updated, you should be on you sabre tree and issue a git pull - - cd mywebsite/sabre - - git pull - - - 3. Create an empty database and note the access details (hostname, username, password, database name). diff --git a/install/database.sql b/install/database.sql index 6be3a31aa..3998c13c7 100644 --- a/install/database.sql +++ b/install/database.sql @@ -423,6 +423,7 @@ CREATE TABLE IF NOT EXISTS `item` ( `changed` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `owner_xchan` char(255) NOT NULL DEFAULT '', `author_xchan` char(255) NOT NULL DEFAULT '', + `source_xchan` char(255) NOT NULL DEFAULT '', `mimetype` char(255) NOT NULL DEFAULT '', `title` text NOT NULL, `body` mediumtext NOT NULL, diff --git a/install/update.php b/install/update.php index 20af0de45..74134f260 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ <?php -define( 'UPDATE_VERSION' , 1077 ); +define( 'UPDATE_VERSION' , 1078 ); /** * @@ -866,3 +866,10 @@ function update_r1076() { return UPDATE_SUCCESS; return UPDATE_FAILED; } + +function update_r1077() { + $r = q("ALTER TABLE `item` ADD `source_xchan` CHAR( 255 ) NOT NULL DEFAULT '' AFTER `author_xchan` "); + if($r) + return UPDATE_SUCCESS; + return UPDATE_FAILED; +} |