Merge pull request #3320 from ExpressionEngine/7.dev

ExpressionEngine 7.2.16

build-tools/build.json

@@ -1,5 +1,5 @@
 {
-    "tag": "7.2.15",
+    "tag": "7.2.16",
 
     "repositories": {
         "app": "git@github.com:ExpressionEngine/ExpressionEngine",

cp-styles/app/styles/components/_fieldsets.scss

@@ -462,3 +462,35 @@ fieldset {
 		background: color(accent-light);
 	}
 }
+
+// Added style for Page Add-on Template setting
+.fields-multiselect {
+	label {
+		display: flex;
+		margin-bottom: 10px;
+		align-items: center;
+
+		@include m-tablet-down {
+			display: block;
+		}
+
+		span {
+			margin-right: 5px;
+			min-width: 60px;
+
+			@include m-tablet-down {
+				max-width: 100%;
+				display: block;
+				margin-bottom: 5px;
+			}
+		}
+
+		select {
+			max-width: 100%;
+
+			@include m-tablet-down {
+				width: 100%;
+			}
+		}
+	}
+}

cp-styles/app/styles/components/_file-field.scss

@@ -241,6 +241,7 @@
     padding: 10px;
     text-align: center;
     border-radius: $border-radius-base;
+    color: var(--ee-secondary-sidebar-item-icon);
 
     img {
       max-width: 200px;

cp-styles/app/styles/legacy/_legacy.scss

@@ -179,7 +179,7 @@
       text-transform: none;
       letter-spacing: revert;
       font-size: 1.728em;
-      color: #111;
+      color: inherit;
       margin-bottom: 0.5em;
       padding: 0;
   }

system/ee/ExpressionEngine/Addons/file/ft.file.php

@@ -515,7 +515,7 @@ private function process_image($function = 'resize', $data = [], $params = array
         $new = $data['filesystem']->createTempFile();
 
         $destination_path = $new_image_dir . $new_image;
-        $destination_url = $data['filesystem']->getUrl("_{$function}/" . rawurlencode($new_image));
+        $destination_url = $data['filesystem']->getUrl("_{$function}/" . $new_image);
         $props = null;
 
         if (!$data['filesystem']->exists($destination_path)) {

system/ee/ExpressionEngine/Addons/member/mod.member.php

@@ -15,6 +15,7 @@ class Member
 {
     public $trigger = 'member';
     public $member_template = true;
+    public $member_fields;
     public $theme_class = 'profile_theme';
     public $request = 'public_profile';
     public $no_menu = array(

system/ee/ExpressionEngine/Addons/pro_variables/mcp.pro_variables.php

@@ -265,7 +265,8 @@ public function group($group_id = null)
                     'type' => 'submit',
                     'value' => '',
                     'text' => 'pro_variables_save',
-                    'working' => 'btn_saving'
+                    'working' => 'btn_saving',
+                    'shortcut' => 's'
                 ));
 
                 // Add button for clearing cache
@@ -955,6 +956,8 @@ public function edit_var($var_id = 'new', $clone_id = null)
             // Do we have settings?
             $settings = $obj->display_settings();
 
+            ee()->load->add_package_path(PATH_ADDONS . $this->package);
+
             // Skip empty settings
             if (empty($settings)) {
                 continue;

system/ee/ExpressionEngine/Addons/rte/Service/CkeditorService.php

@@ -178,7 +178,7 @@ protected function insertConfigJsById()
         static::$_includedConfigs[] = $configHandle;
 
         if (isset($config['height']) && !empty($config['height'])) {
-            ee()->cp->add_to_head('<style type="text/css">.ck-editor__editable_inline { min-height: ' . $config['height'] . 'px; }</style>');
+            ee()->cp->add_to_head('<style type="text/css">.rte_' . $configHandle . '.ck-editor__editable_inline { min-height: ' . $config['height'] . 'px; }</style>');
         }
 
         if (isset($config['css_template']) && !empty($config['css_template'])) {

system/ee/ExpressionEngine/Addons/structure/acc.structure.php

@@ -22,6 +22,8 @@ class Structure_acc
     public $structure;
     public $installed = false;
     public $data = array();
+    public $version;
+    public $cache;
 
     /**
      * Constructor

system/ee/ExpressionEngine/Addons/structure/ext.structure.php

@@ -28,6 +28,9 @@ class Structure_ext
     public $parent_id;
     public $page_title;
     public $uri;
+    public $structure;
+    public $segment_1;
+    public $top_id;
 
     public function __construct($settings = '')
     {
@@ -272,7 +275,7 @@ public function sessions_end($session)
                 $session_id = null;
             }
 
-            $url = new \EllisLab\ExpressionEngine\Library\CP\URL(
+            $url = new \ExpressionEngine\Library\CP\URL(
                 $path,
                 $session_id,
                 '',

system/ee/ExpressionEngine/Addons/structure/mod.structure.php

@@ -31,6 +31,7 @@ class Structure extends Channel
     public $query_string;
     public $cat_trigger;
     public $site_pages;
+    public $sql;
 
     public function __construct()
     {

system/ee/ExpressionEngine/Addons/structure/sql.structure.php

@@ -991,7 +991,7 @@ private function _get_page_titles($sql_fields, $include_listings)
         $structure_channel_ids = $this->_get_structure_channel_ids($include_listings);
 
         // Get the Channel Entries that have are in a Structure Channel
-        $selectFields = array_map(function($field_data) {
+        $selectFields = array_map(function ($field_data) {
             return 'field_id_' . $field_data['field_id'];
         }, $sql_fields);
         $channelEntries = ee('Model')->get('ChannelEntry')->fields('entry_id', 'channel_id', 'site_id', 'title');
@@ -1183,7 +1183,7 @@ public function get_listing_entry_ids()
         $listing_ids_empty = StaticCache::get('listing_ids_empty');
 
         if (!is_array($listing_ids)) {
-			$listing_ids = array();
+            $listing_ids = array();
         }
 
         if (empty($listing_ids_empty) && empty($listing_ids)) {

system/ee/ExpressionEngine/Addons/structure/upd.structure.php

@@ -21,6 +21,7 @@ class Structure_upd
     public $sql;
     public $version;
     public $page_title;
+    public $nset;
 
     public function __construct($switch = true)
     {

system/ee/ExpressionEngine/Addons/toggle/ft.toggle.php

@@ -196,6 +196,16 @@ public function save_settings($data)
     {
         $all = array_merge($this->settings_vars, $data);
 
+        if (is_null($this->field_id)) {
+            ee('CP/Alert')->makeInline('search-reindex')
+                ->asImportant()
+                ->withTitle(lang('search_reindex_tip'))
+                ->addToBody(sprintf(lang('search_reindex_tip_desc'), ee('CP/URL')->make('utilities/reindex')->compile()))
+                ->defer();
+
+            ee()->config->update_site_prefs(['search_reindex_needed' => ee()->localize->now], 0);
+        }
+
         return array_intersect_key($all, $this->settings_vars);
     }
 

system/ee/ExpressionEngine/Library/CP/FileManager/Traits/FileManagerTrait.php

@@ -26,6 +26,8 @@ protected function listingsPage($uploadLocation = null, $view_type = 'list', $fi
         $controller = $filepickerMode ? 'addons/settings/filepicker/modal' : (empty($uploadLocation) ? 'files' : 'files/directory/' . $upload_location_id);
         $base_url = ee('CP/URL')->make($controller);
 
+        $member = ee()->session->getMember();
+
         if (empty($uploadLocation)) {
             $model = 'File';
         } else {
@@ -59,6 +61,10 @@ protected function listingsPage($uploadLocation = null, $view_type = 'list', $fi
         if (empty($upload_location_id)) {
             $files->filter('UploadDestination.module_id', 0)
                 ->filter('site_id', ee()->config->item('site_id'));
+            if (! ee('Permission')->isSuperAdmin()) {
+                $assigned_dirs = $member->getAssignedUploadDestinations()->pluck('id');
+                $files->filter('upload_location_id', 'IN', $assigned_dirs);
+            }
         } else {
             $files->filter('upload_location_id', $upload_location_id);
         }
@@ -287,8 +293,6 @@ function ($key) {
         $data = array();
         $missing_files = false;
 
-        $member = ee()->session->getMember();
-
         $destinationsToEagerLoad = [];
 
         foreach ($files as $file) {

system/ee/ExpressionEngine/Model/Channel/ChannelLayout.php

@@ -175,6 +175,9 @@ public function synchronize($fields = [])
         $field_layout = $this->field_layout;
 
         foreach ($field_layout as $i => $section) {
+            if (!isset($section['fields']) || empty($section['fields'])) {
+                continue;
+            }
             foreach ($section['fields'] as $j => $field_info) {
                 $field_name = isset($field_info['field']) ? $field_info['field'] : 0;
 

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', '7.2.15');
+define('APP_VER', '7.2.16');
 define('PATH_THEMES', realpath(SYSPATH . '/../themes') . '/');
 define('DOC_URL', 'http://our.doc.url/');
 define('PATH_THIRD', SYSPATH . 'user/addons/');

system/ee/ExpressionEngine/View/_shared/form/field.php

@@ -172,10 +172,11 @@
 <?php break;
     // no break
 case 'multiselect': ?>
-    <div class="fields-select" class="<?=$class?>">
+    <div class="fields-select fields-multiselect <?=$class?>">
         <div class="field-inputs">
             <?php foreach ($field['choices'] as $field_name => $options): ?>
-                <label><?=$options['label']?>
+                <label>
+                    <span><?=$options['label']?></span>
                     <?=form_dropdown($field_name, $options['choices'], $options['value'])?>
                 </label>
             <?php endforeach ?>

system/ee/ExpressionEngine/View/_templates/login.php

@@ -10,6 +10,15 @@
 		<?=ee()->view->head_link('css/common.min.css'); ?>
 	</head>
 	<body data-ee-version="<?=APP_VER?>">
+		<script type="text/javascript">
+			var currentTheme = localStorage.getItem('theme');
+
+			// Restore the currently selected theme
+			// This is at the top of the body to prevent the default theme from flashing
+			if (currentTheme) {
+				document.body.dataset.theme = currentTheme;
+			}
+		</script>
 		<section role="main" class="login-container">
 			<section class="login">
 

system/ee/installer/controllers/wizard.php

@@ -13,7 +13,7 @@
  */
 class Wizard extends CI_Controller
 {
-    public $version = '7.2.15'; // The version being installed
+    public $version = '7.2.16'; // 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)

system/ee/installer/updates/ud_7_02_16.php

@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * This source file is part of the open source project
+ * ExpressionEngine (https://expressionengine.com)
+ *
+ * @link      https://expressionengine.com/
+ * @copyright Copyright (c) 2003-2023, Packet Tide, LLC (https://www.packettide.com)
+ * @license   https://expressionengine.com/license Licensed under Apache License, Version 2.0
+ */
+
+namespace ExpressionEngine\Updater\Version_7_2_16;
+
+/**
+ * Update
+ */
+class Updater
+{
+    public $version_suffix = '';
+
+    /**
+     * Do Update
+     *
+     * @return TRUE
+     */
+    public function do_update()
+    {
+        return true;
+    }
+}
+
+// EOF

system/ee/installer/views/container.php

@@ -19,6 +19,15 @@
         ?>
 	</head>
 	<body class="installer-page">
+		<script type="text/javascript">
+			var currentTheme = localStorage.getItem('theme');
+
+			// Restore the currently selected theme
+			// This is at the top of the body to prevent the default theme from flashing
+			if (currentTheme) {
+				document.body.dataset.theme = currentTheme;
+			}
+		</script>
 		<section class="flex-wrap">
 			<section class="wrap">
 				<div class="login__logo"><?=$logo?></div>

system/ee/language/english/admin_content_lang.php

@@ -868,7 +868,7 @@
 
     'toggle_default_value_desc' => 'The default position of the toggle switch for this field when publishing new entries.',
 
-    'toggle_default_value_desc_cont' => '<b>Note</b>: If assigned to a channel with existing entries, those entries will be assigned this value.',
+    'toggle_default_value_desc_cont' => '<b>Note</b>: To assign default value to existing entries, search reindex will need to be run after associating this field to channels.',
 
     'unauthorized_for_this_channel' => 'You are not authorized to post in this channel',
 

system/ee/legacy/helpers/custom_field_helper.php

@@ -36,7 +36,7 @@ function encode_multi_field($data = array())
     foreach ($data as $key => $val) {
         $data[$key] = is_array($val)
             ? encode_multi_field($val)
-            : str_replace(array('\\', '|'), array('\\\\', '\|'), $val);
+            : str_replace(array('\\', '|'), array('\\\\', '\|'), (string) $val);
     }
 
     // Implode on seperator

system/ee/legacy/libraries/Core.php

@@ -74,8 +74,8 @@ public function bootstrap()
 
         // application constants
         define('APP_NAME', 'ExpressionEngine');
-        define('APP_BUILD', '20230406');
-        define('APP_VER', '7.2.15');
+        define('APP_BUILD', '20230414');
+        define('APP_VER', '7.2.16');
         define('APP_VER_ID', '');
         define('SLASH', '/');
         define('LD', '{');