| @@ -61,10 +61,12 @@ | ||
| 61 | 61 | return $default; |
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | $this->initSession(); |
| 65 | - $returnValue = acym_getVar($type, $varName); | |
| 66 | 65 | |
| 66 | + $isVarInRequest = !is_null(acym_getVar('raw', $varName, null, '', ACYM_ALLOWRAW)); | |
| 67 | + $returnValue = $isVarInRequest ? acym_getVar($type, $varName) : null; | |
| 68 | + | |
| 67 | 69 | if (is_null($returnValue) && $overrideIfNull) { |
| 68 | 70 | $returnValue = $default; |
| 69 | 71 | } |
| 70 | 72 | |
| @@ -174,17 +176,14 @@ | ||
| 174 | 176 | acym_addStyle(false, ACYM_CSS.'libraries/spectrum.min.css?v='.filemtime(ACYM_MEDIA.'css'.DS.'libraries'.DS.'spectrum.min.css')); |
| 175 | 177 | } |
| 176 | 178 | |
| 177 | 179 | if (in_array('datepicker', $scripts)) { |
| 178 | - // Must be loaded in the right order | |
| 179 | 180 | if (ACYM_CMS === 'joomla') { |
| 180 | 181 | acym_addScript(false, ACYM_JS.'libraries/moment.min.js?v='.filemtime(ACYM_MEDIA.'js'.DS.'libraries'.DS.'moment.min.js')); |
| 182 | + } else { | |
| 183 | + wp_enqueue_script('moment'); | |
| 181 | 184 | } |
| 182 | - acym_addScript(false, ACYM_JS.'libraries/rome.min.js?v='.filemtime(ACYM_MEDIA.'js'.DS.'libraries'.DS.'rome.min.js'), [ | |
| 183 | - 'dependencies' => ['moment'], | |
| 184 | - ]); | |
| 185 | - acym_addScript(false, ACYM_JS.'libraries/material-datetime-picker.min.js?v='.filemtime(ACYM_MEDIA.'js'.DS.'libraries'.DS.'material-datetime-picker.min.js')); | |
| 186 | - acym_addStyle(false, ACYM_CSS.'libraries/material-datetime-picker.min.css?v='.filemtime(ACYM_MEDIA.'css'.DS.'libraries'.DS.'material-datetime-picker.min.css')); | |
| 185 | + acym_addScript(true, 'window.ACYM_DATE_NOW = "'.gmdate('Y-m-d\TH:i', time() + acym_getTimeOffsetCMS()).'";'); | |
| 187 | 186 | } |
| 188 | 187 | |
| 189 | 188 | if (in_array('dtextPicker', $scripts)) { |
| 190 | 189 | acym_addScript(false, ACYM_JS.'dtext_picker.min.js?v='.filemtime(ACYM_MEDIA.'js'.DS.'dtext_picker.min.js')); |
