Merge pull request #3510 from ExpressionEngine/6.dev

ExpressionEngine 6.4.12
ExpressionEngine · Jun 13, 2023 · 55ce678 · 55ce678
2 parents 69b7533 + 61f99ec
commit 55ce678
Show file tree

Hide file tree

Showing 38 changed files with 204 additions and 42 deletions.
diff --git a/build-tools/build.json b/build-tools/build.json
@@ -1,5 +1,5 @@
 {
-    "tag": "6.4.11",
+    "tag": "6.4.12",
 
     "repositories": {
         "app": "git@github.com:ExpressionEngine/ExpressionEngine",

diff --git a/build-tools/gulpfile.js b/build-tools/gulpfile.js
@@ -373,6 +373,8 @@ gulp.task('_delete_files', function (cb) {
 		'system/ee/EllisLab/Tests/',
 		'system/ee/ExpressionEngine/Tests/',
 
+		'.php-cs-fixer.dist.php',
+
 		'src',
 		'vue.config.js',
 		'npm-shrinkwrap.json',

diff --git a/cp-styles/app/styles/base/_inputs.scss b/cp-styles/app/styles/base/_inputs.scss
@@ -193,7 +193,12 @@ em label input[type='checkbox'] {
 }
 
 
-
+input[type=text][dir=rtl][field_content_type=numeric],
+input[type=text][dir=rtl][field_content_type=integer],
+input[type=text][dir=rtl][field_content_type=decimal]{
+  direction: ltr;
+  text-align: right;
+}
 
 // $input-padding: 8px;
 

diff --git a/cp-styles/app/styles/components/_sidebar.scss b/cp-styles/app/styles/components/_sidebar.scss
@@ -104,6 +104,14 @@ $link-padding: 6px 12px;
 			border-radius: $border-radius-base;
 		}
 	}
+
+	@include m-tablet-down {
+		display: flex;
+
+		a {
+			display: inline-block;
+		}
+	}
 }
 
 .ui-sortable .sidebar__link .ui-sortable-handle i {

diff --git a/system/ee/ExpressionEngine/Addons/channel/mod.channel.php b/system/ee/ExpressionEngine/Addons/channel/mod.channel.php
@@ -1214,7 +1214,9 @@ public function build_sql_query($qstring = '')
             }
 
             if (empty($channel_ids)) {
-                return '';
+                if ($channelInOperator == 'IN') {
+                    return '';
+                }
             } else {
                 $sql .= "AND t.channel_id " . $channelInOperator . " (" . implode(',', $channel_ids) . ") ";
             }

diff --git a/system/ee/ExpressionEngine/Addons/grid/ft.grid.php b/system/ee/ExpressionEngine/Addons/grid/ft.grid.php
@@ -177,8 +177,8 @@ public function display_field($data)
         $grid = ee('CP/GridInput', array(
             'field_name' => $this->name(),
             'lang_cols' => false,
-            'grid_min_rows' => $this->settings['grid_min_rows'],
-            'grid_max_rows' => $this->settings['grid_max_rows'],
+            'grid_min_rows' => isset($this->settings['grid_min_rows']) ? $this->settings['grid_min_rows'] : 0,
+            'grid_max_rows' => isset($this->settings['grid_max_rows']) ? $this->settings['grid_max_rows'] : '',
             'reorder' => isset($this->settings['allow_reorder'])
                 ? get_bool_from_string($this->settings['allow_reorder'])
                 : true,

diff --git a/system/ee/ExpressionEngine/Addons/pages/tab.pages.php b/system/ee/ExpressionEngine/Addons/pages/tab.pages.php
@@ -236,6 +236,9 @@ private function makeValidTemplateRule($values)
     private function makeValidURIRule()
     {
         return function ($field, $value) {
+            if (empty($value)) {
+                return true;
+            }
             $c_page_uri = preg_replace(
                 "#[^a-zA-Z0-9_\-/\.]+$#i",
                 '',
@@ -259,6 +262,9 @@ private function makeValidURIRule()
     private function makeValidSegmentCountRule()
     {
         return function ($field, $value) {
+            if (empty($value)) {
+                return true;
+            }
             $value_segs = substr_count(trim($value, '/'), '/');
 
             // More than 9 pages URI segs?  goodbye
@@ -279,6 +285,9 @@ private function makeValidSegmentCountRule()
     private function makeNotDuplicatedRule($entry)
     {
         return function ($field, $value) use ($entry) {
+            if (empty($value)) {
+                return true;
+            }
             $static_pages = ee()->config->item('site_pages');
             $uris = $static_pages[ee()->config->item('site_id')]['uris'];
 

diff --git a/system/ee/ExpressionEngine/Controller/Channels/Sets.php b/system/ee/ExpressionEngine/Controller/Channels/Sets.php
@@ -195,10 +195,10 @@ public function doImport()
             $set->cleanUpSourceFiles();
             $errors = $result->getErrors();
             $model_errors = $result->getModelErrors();
-            foreach (array('Channel Field', 'Category', 'Category Group', 'Status') as $type) {
+            foreach (array('Channel Field', 'Category', 'Category Group', 'Status', 'Upload Destination') as $type) {
                 if (isset($model_errors[$type])) {
                     foreach ($model_errors[$type][0][2] as $error) {
-                        $errors[] = $error->getLanguageKey();
+                        $errors[] = $type . ': ' . $model_errors[$type][0][1] . ' &mdash; ' . $error->getLanguageKey();
                     }
                 }
             }

diff --git a/system/ee/ExpressionEngine/Controller/Design/Template.php b/system/ee/ExpressionEngine/Controller/Design/Template.php
@@ -1059,6 +1059,7 @@ private function getExistingTemplates($selected_id = null)
         $templates = ee('Model')->get('Template')
             ->with('TemplateGroup')
             ->with('Site')
+            ->filter('TemplateGroup.group_id', 'IS NOT', null)
             ->order('TemplateGroup.group_name')
             ->order('Template.template_name');
 

diff --git a/system/ee/ExpressionEngine/Controller/Logs/Logs.php b/system/ee/ExpressionEngine/Controller/Logs/Logs.php
@@ -112,7 +112,7 @@ protected function delete($model, $log_type)
         $query = ee('Model')->get($model, $id);
 
         $count = $query->count();
-        $query->all()->delete();
+        $query->delete();
 
         $message = sprintf(lang('logs_deleted_desc'), $count, lang($log_type));
 

diff --git a/system/ee/ExpressionEngine/Controller/Publish/Edit.php b/system/ee/ExpressionEngine/Controller/Publish/Edit.php
@@ -355,7 +355,7 @@ public function entry($id = null, $autosave_id = null)
         }
 
         $entry = ee('Model')->get('ChannelEntry', $id)
-            ->with('Channel', 'Autosaves')
+            ->with('Channel', 'Status', 'Autosaves')
             ->all()
             ->first();
 

diff --git a/system/ee/ExpressionEngine/Library/Parser/Conditional/BooleanExpression.php b/system/ee/ExpressionEngine/Library/Parser/Conditional/BooleanExpression.php
@@ -50,6 +50,11 @@ public function add($token)
      */
     public function evaluate()
     {
+        if (empty($this->tokens)) {
+            // none of tokens is defined, null === null
+            return true;
+        }
+
         $rpn = $this->convertToRPN($this->tokens);
 
         return $this->bool($this->evaluateRPN($rpn));

diff --git a/system/ee/ExpressionEngine/Model/Channel/ChannelEntry.php b/system/ee/ExpressionEngine/Model/Channel/ChannelEntry.php
@@ -475,12 +475,15 @@ public function onBeforeUpdate($changed)
 
     private function ensureStatusSynced($update_by_name)
     {
-        if ($update_by_name) {
+        // if selected status is new one, but has the same name as the one that was deleted
+        // then there's no change and $update_by_name would be false
+        // so additional check if Status (by status_id) actually exists
+        if ($update_by_name === false && !is_null($this->Status)) {
+            $this->setProperty('status', $this->Status->status);
+        } else {
             $this->Status = $this->getModelFacade()->get('Status')
                 ->filter('status', $this->getProperty('status'))
                 ->first();
-        } else {
-            $this->setProperty('status', $this->Status->status);
         }
     }
 

diff --git a/system/ee/ExpressionEngine/Model/Channel/Display/DefaultChannelLayout.php b/system/ee/ExpressionEngine/Model/Channel/Display/DefaultChannelLayout.php
@@ -214,6 +214,7 @@ public function transform(array $fields)
     {
         $display = parent::transform($fields);
 
+        // show message if there are no category groups assigned
         $tab = $display->getTab('categories');
         $fields = $tab->getFields();
         if (count($fields) == 0) {

diff --git a/system/ee/ExpressionEngine/Model/Content/Display/FieldDisplay.php b/system/ee/ExpressionEngine/Model/Content/Display/FieldDisplay.php
@@ -37,6 +37,11 @@ public function getId()
         return $this->field->getId();
     }
 
+    public function getData()
+    {
+        return $this->field->getData();
+    }
+
     public function getType()
     {
         return $this->field->getItem('field_type');

diff --git a/system/ee/ExpressionEngine/Model/Content/Display/LayoutTab.php b/system/ee/ExpressionEngine/Model/Content/Display/LayoutTab.php
@@ -43,6 +43,20 @@ public function setFields($fields)
 
     public function addField($field)
     {
+        // not sure this is the best place for this check, but:
+        // we need to show alert if the status is not available,
+        // and this is the point where we for sure have all data
+        if ($field->getId() == 'status') {
+            if (! array_key_exists($field->getData(), $field->get('field_list_items'))) {
+                ee('CP/Alert')->makeInline('status-not-available')
+                    ->asWarning()
+                    ->cannotClose()
+                    ->withTitle(lang('status_not_available'))
+                    ->addToBody(sprintf(lang('status_not_available_desc'), $field->getData()))
+                    ->now();
+            }
+        }
+
         $this->fields[] = $field;
 
         return $this;

diff --git a/system/ee/ExpressionEngine/Model/Content/FieldModel.php b/system/ee/ExpressionEngine/Model/Content/FieldModel.php
@@ -503,6 +503,9 @@ public function parse($data, $content_id, $content_type, $variable_mods, $tagdat
                 false
             ));
         }
+        if (is_null($data)) {
+            $data = '';
+        }
         if ($tag) {
             return str_replace(LD . $tag . RD, $data, $tagdata);
         }

diff --git a/system/ee/ExpressionEngine/Model/Role/Role.php b/system/ee/ExpressionEngine/Model/Role/Role.php
@@ -184,8 +184,11 @@ public function getMembersCount($mode = 'all')
             $query->where('members_roles.role_id', $this->getId());
         }
         if (in_array($mode, ['all', 'primary'])) {
-            foreach ($this->RoleGroups as $role_group) {
-                $query->or_where('members_role_groups.group_id', $role_group->getId());
+            $roleGroupsQuery = ee('db')->select('group_id')->from('roles_role_groups')->where('role_id', $this->getId())->get();
+            if ($roleGroupsQuery->num_rows() > 0) {
+                foreach ($roleGroupsQuery->result_array() as $roleGroup) {
+                    $query->or_where('members_role_groups.group_id', $roleGroup['group_id']);
+                }
             }
         }
 

diff --git a/system/ee/ExpressionEngine/Model/Status/Status.php b/system/ee/ExpressionEngine/Model/Status/Status.php
@@ -63,7 +63,9 @@ class Status extends Model
     );
 
     protected static $_events = array(
-        'beforeInsert'
+        'beforeInsert',
+        'afterInsert',
+        'afterUpdate'
     );
 
     protected $status_id;
@@ -99,6 +101,31 @@ public function onBeforeInsert()
         }
     }
 
+    /**
+     * New status might have same name as the one that was deleted
+     * and the entries were left orphan
+     * In that case, we establish relationship
+     */
+    public function onAfterInsert()
+    {
+        //direct SQL, as we need it to be fast
+        ee('db')->where('status', $this->getProperty('status'))->update('channel_titles', ['status_id' => $this->getId()]);
+    }
+
+    /**
+     * Update the existing entries using this status
+     *
+     * @param array $previous
+     * @return void
+     */
+    public function onAfterUpdate($previous)
+    {
+        if ($previous['status'] != $this->status) {
+            //direct SQL, as we need it to be fast
+            ee('db')->where('status', $previous['status'])->update('channel_titles', ['status' => $this->status]);
+        }
+    }
+
     /**
      * Returns the value and rendered label for option select input display
      *

diff --git a/system/ee/ExpressionEngine/Service/ChannelSet/Export.php b/system/ee/ExpressionEngine/Service/ChannelSet/Export.php
@@ -344,8 +344,14 @@ private function exportUploadDestination($id)
     {
         $dir = ee('Model')->get('UploadDestination', $id)->first();
 
+        if (is_null($dir)) {
+            return 'all';
+        }
+
         $result = new StdClass();
         $result->name = $dir->name;
+        $result->server_path = $dir->server_path;
+        $result->url = $dir->url;
 
         $this->upload_destinations[$dir->name] = $result;
 
@@ -478,8 +484,10 @@ private function exportRelationshipField($field)
             $result->channels = array();
 
             foreach ($settings['channels'] as $id) {
-                $channel = $this->channels[$id];
-                $result->channels[] = $channel->channel_title;
+                if (array_key_exists($id, $this->channels)) {
+                    $channel = $this->channels[$id];
+                    $result->channels[] = $channel->channel_title;
+                }
             }
         }
 

diff --git a/system/ee/ExpressionEngine/Service/ChannelSet/Set.php b/system/ee/ExpressionEngine/Service/ChannelSet/Set.php
@@ -441,6 +441,8 @@ private function loadUploadDestinations($destinations)
             $destination = ee('Model')->make('UploadDestination');
             $destination->site_id = $this->site_id;
             $destination->name = $upload_data->name;
+            $destination->url = isset($upload_data->url) ? $upload_data->url : '{base_url}';
+            $destination->server_path = isset($upload_data->server_path) ? $upload_data->server_path : null;
 
             $this->applyOverrides($destination, $upload_data->name);
 
@@ -799,7 +801,7 @@ private function loadChannelField(\SplFileInfo $file)
 
         foreach ($data as $key => $value) {
             if (($type == 'grid' || $type == 'file_grid') && $key == 'columns') {
-                $this->importGrid($field, $value);
+                $this->importGrid($field, $value, $type);
 
                 continue;
             }
@@ -888,11 +890,11 @@ private function loadCategoryField(\SplFileInfo $file)
      * @param Array $columns The columns defined in the field.type file
      * @return void
      */
-    private function importGrid($field, $columns)
+    private function importGrid($field, $columns, $type = 'grid')
     {
         $that = $this;
-        $fn = function () use ($columns, $that) {
-            unset($_POST['grid']);
+        $fn = function () use ($columns, $that, $type) {
+            unset($_POST[$type]);
 
             // grid[cols][new_0][col_label]
             foreach ($columns as $i => $column) {
@@ -904,7 +906,7 @@ private function importGrid($field, $columns)
                 }
 
                 foreach ($column as $col_label => $col_value) {
-                    $_POST['grid']['cols']["new_{$i}"]['col_' . $col_label] = $col_value;
+                    $_POST[$type]['cols']["new_{$i}"]['col_' . $col_label] = $col_value;
                 }
             }
         };

diff --git a/system/ee/ExpressionEngine/Tests/bootstrap.php b/system/ee/ExpressionEngine/Tests/bootstrap.php
@@ -11,7 +11,7 @@
 define('BASEPATH', SYSPATH . 'ee/legacy/');
 define('PATH_CACHE', SYSPATH . 'user/cache/');
 define('APPPATH', BASEPATH);
-define('APP_VER', '6.4.11');
+define('APP_VER', '6.4.12');
 define('PATH_THEMES', realpath(SYSPATH . '/../themes') . '/');
 define('DOC_URL', 'http://our.doc.url/');
 define('PATH_THIRD', SYSPATH . 'user/addons/');

diff --git a/system/ee/ExpressionEngine/View/_shared/form/field.php b/system/ee/ExpressionEngine/View/_shared/form/field.php
@@ -108,7 +108,7 @@
         'field_name' => $field_name,
         'choices' => $field['choices'],
         'disabled_choices' => isset($field['disabled_choices']) ? $field['disabled_choices'] : null,
-        'value' => $value,
+        'value' => is_array($value) ? array_unique($value) : $value,
         'scalar' => isset($field['scalar']) ? $field['scalar'] : null,
         'multi' => ($field['type'] == 'checkbox'),
         'nested' => isset($field['nested']) ? $field['nested'] : false,

diff --git a/system/ee/ExpressionEngine/View/_shared/upgrade_success_banner.php b/system/ee/ExpressionEngine/View/_shared/upgrade_success_banner.php
@@ -1,7 +1,7 @@
 <?php if ((empty(ee()->uri->segment(2)) || ee()->uri->segment(2) == 'homepage') && ee()->session->getMember()->dismissed_banner != 'y') : ?>
     <div class="upgrade-success-banner__wrapper" style="background-image: url('<?= URL_THEMES ?>asset/img/ee-pro-promo-banner-bg@2x.png');">
-        <a href="<?= DOC_URL . 'installation/changelog.html#version-640' ?>" class="upgrade-success-banner__title" target="_blank">&#127881; ExpressionEngine <strong>6.4.0</strong></a>
-        <a href="<?= DOC_URL . 'installation/changelog.html#version-640' ?>" class="upgrade-success-banner__title-link" target="_blank"><i class="fas fa-clipboard"></i> Release Notes&hellip;</a>
+        <a href="<?= DOC_URL . 'installation/changelog.html#version-' . str_replace('.', '', APP_VER) ?>" class="upgrade-success-banner__title" target="_blank">&#127881; ExpressionEngine <strong><?=APP_VER?></strong></a>
+        <a href="<?= DOC_URL . 'installation/changelog.html#version-' . str_replace('.', '', APP_VER) ?>" class="upgrade-success-banner__title-link" target="_blank"><i class="fas fa-clipboard"></i> Release Notes&hellip;</a>
 
         <!-- Change number of blurb columns via inline grid style below IF less than 3 blurbs: -->
         <div class="upgrade-success-banner__blurb-wrapper" style="grid-template-columns: repeat(3, 1fr);">
@@ -18,10 +18,10 @@
             </a>
             <a href="https://expressionengine.com/blog/expressionengine-7-official-release" class="upgrade-success-banner__blurb" target="_blank">
                 <i class="fas fa-star fa-fw"></i>
-                <h6>ExpressionEngine 7</h6>
-                <p>We're pleased to announce the release of ExpressionEngine version 7. The largest ExpressionEngine release ever. <span class="upgrade-success-banner__blurb-learn">Find out more&hellip;</span></p>
+                <h6>ExpressionEngine 7.3 is Available</h6>
+                <p>Along with the new File Manager, the latest ExpressionEngine 7 release allows Field Groups in Fluid fields, chaining variable modifiers in templates, and new CLI commands. <span class="upgrade-success-banner__blurb-learn">Find out more&hellip;</span></p>
             </a>
         </div>
         <a href="<?= ee('CP/URL')->make('homepage/dismissBanner')->compile(); ?>" class="banner-dismiss"></a>
     </div>
-<?php endif; ?>
+<?php endif; ?>
diff --git a/system/ee/installer/controllers/wizard.php b/system/ee/installer/controllers/wizard.php
@@ -13,7 +13,7 @@
  */
 class Wizard extends CI_Controller
 {
-    public $version = '6.4.11'; // The version being installed
+    public $version = '6.4.12'; // The version being installed
     public $installed_version = '';  // The version the user is currently running (assuming they are running EE)
     public $schema = null; // This will contain the schema object with our queries
     public $languages = array(); // Available languages the installer supports (set dynamically based on what is in the "languages" folder)