CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-07-02 21:20:58 +12:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/appwrite/appwrite into 0.11.x

Browse source
This commit is contained in:
Torsten Dittmann 2021-10-16 14:13:32 +02:00
parent ee1fc104b4 dd88e32475
commit b3dd0133a1
4 changed files with 24 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CONTRIBUTING.md
View file

@ -395,7 +395,7 @@ Pull requests are great, but there are many other areas where you can help Appwr
### Blogging & Speaking ### Blogging & Speaking
Blogging, speaking about, or creating tutorials about one of Appwrite’s many features. Mention [@appwrite_io](https://twitter.com/appwrite_io) on Twitter and/or email team [at] appwrite [dot] io so we can give pointers and tips and help you spread the word by promoting your content on the different Appwrite communication channels. Please add your blog posts and videos of talks to our [Awesome Appwrite](https://github.com/appwrite/awesome-appwrite) repo on GitHub. Blogging, speaking about, or creating tutorials about one of Appwrite’s many features. Mention [@appwrite_io](https://twitter.com/appwrite_io) on Twitter and/or [email team@appwrite.io](mailto:team@appwrite.io) so we can give pointers and tips and help you spread the word by promoting your content on the different Appwrite communication channels. Please add your blog posts and videos of talks to our [Awesome Appwrite](https://github.com/appwrite/awesome-appwrite) repo on GitHub.
### Presenting at Meetups ### Presenting at Meetups

1
public/styles/forms.less
View file

@ -412,6 +412,7 @@ fieldset {
width: ~"calc(100% - 2px)"; width: ~"calc(100% - 2px)";
max-height: 180px; max-height: 180px;
visibility: visible !important; visibility: visible !important;
object-fit: contain;
} }
.video-preview { .video-preview {

18
src/Appwrite/Migration/Migration.php
View file

@ -99,7 +99,6 @@ abstract class Migration
Console::log('Migrating: ' . $offset . ' / ' . $this->projectDB->getSum()); Console::log('Migrating: ' . $offset . ' / ' . $this->projectDB->getSum());
\Co\run(function () use ($all, $callback) { \Co\run(function () use ($all, $callback) {
foreach ($all as $document) { foreach ($all as $document) {
go(function () use ($document, $callback) { go(function () use ($document, $callback) {
if (empty($document->getId()) || empty($document->getCollection())) { if (empty($document->getId()) || empty($document->getCollection())) {
@ -134,24 +133,23 @@ abstract class Migration
} }
} }
public function check_diff_multi($array1, $array2){ public function check_diff_multi($array1, $array2)
{
$result = array(); $result = array();
foreach($array1 as $key => $val) { foreach ($array1 as $key => $val) {
if(is_array($val) && isset($array2[$key])) { if (is_array($val) && isset($array2[$key])) {
$tmp = $this->check_diff_multi($val, $array2[$key]); $tmp = $this->check_diff_multi($val, $array2[$key]);
if($tmp) { if ($tmp) {
$result[$key] = $tmp; $result[$key] = $tmp;
} }
} } elseif (!isset($array2[$key])) {
elseif(!isset($array2[$key])) {
$result[$key] = null; $result[$key] = null;
} } elseif ($val !== $array2[$key]) {
elseif($val !== $array2[$key]) {
$result[$key] = $array2[$key]; $result[$key] = $array2[$key];
} }
if(isset($array2[$key])) { if (isset($array2[$key])) {
unset($array2[$key]); unset($array2[$key]);
} }
} }

4
src/Appwrite/Migration/Version/V06.php
View file

@ -2,7 +2,6 @@
namespace Appwrite\Migration\Version; namespace Appwrite\Migration\Version;
use Utopia\App; use Utopia\App;
use Utopia\CLI\Console; use Utopia\CLI\Console;
use Appwrite\Database\Database; use Appwrite\Database\Database;
@ -35,8 +34,7 @@ class V06 extends Migration
case Database::SYSTEM_COLLECTION_KEYS: case Database::SYSTEM_COLLECTION_KEYS:
if ($document->getAttribute('secret', null)) { if ($document->getAttribute('secret', null)) {
$json = \json_decode($document->getAttribute('secret'), true); $json = \json_decode($document->getAttribute('secret'), true);
if (is_array($json)) if (is_array($json)) {
{
Console::log('Secret already encrypted. Skipped: ' . $document->getId()); Console::log('Secret already encrypted. Skipped: ' . $document->getId());
break; break;
} }