diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-09-28 19:07:31 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-09-28 19:07:31 -0700 |
| commit | 5c526995d8534465602775dfddebd8d77855d2e2 (patch) | |
| tree | 2285e6d7ae960853a72642bb5a76c8abba304464 | |
| parent | 50ee82e8bd031abe969ad304233cfdb9849bdac6 (diff) | |
| download | volse-hubzilla-5c526995d8534465602775dfddebd8d77855d2e2.tar.gz volse-hubzilla-5c526995d8534465602775dfddebd8d77855d2e2.tar.bz2 volse-hubzilla-5c526995d8534465602775dfddebd8d77855d2e2.zip | |
resolve conflicts
| -rw-r--r-- | include/zot.php | 7 | ||||
| -rw-r--r-- | install/update.php | 3 |
2 files changed, 0 insertions, 10 deletions
diff --git a/include/zot.php b/include/zot.php index eaaf30fff..ef9f325d0 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1593,13 +1593,6 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $ continue; } - - if($d['hash'] === $sender['hash']) { - $DR->update('self delivery ignored'); - $result[] = $DR->get(); - continue; - } - // allow public postings to the sys channel regardless of permissions, but not // for comments travelling upstream. Wait and catch them on the way down. // They may have been blocked by the owner. diff --git a/install/update.php b/install/update.php index ca4e90a9d..ace5239b5 100644 --- a/install/update.php +++ b/install/update.php @@ -1885,6 +1885,3 @@ function update_r1155() { return UPDATE_FAILED; } -function update_r1155() { - return UPDATE_SUCCESS; -} |