Skip to content

Commit fef74ed

Browse files
sheabungesheabunge
committed
Don't update the modification date when activating and deactivating
1 parent 1424bb0 commit fef74ed

File tree

3 files changed

+66
-96
lines changed

3 files changed

+66
-96
lines changed

‎languages/code-snippets.pot

Lines changed: 61 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -224,249 +224,241 @@ msgstr ""
224224
msgid "Snippets per page"
225225
msgstr ""
226226

227-
#: php/class-list-table.php:154
227+
#: php/class-list-table.php:153
228228
msgid "Network Active"
229229
msgstr ""
230230

231-
#: php/class-list-table.php:156
231+
#: php/class-list-table.php:155
232232
msgid "Network Only"
233233
msgstr ""
234234

235-
#: php/class-list-table.php:162
235+
#: php/class-list-table.php:161
236236
msgid "Edit"
237237
msgstr ""
238238

239-
#: php/class-list-table.php:163, php/class-list-table.php:415
239+
#: php/class-list-table.php:162, php/class-list-table.php:413
240240
msgid "Clone"
241241
msgstr ""
242242

243-
#: php/class-list-table.php:164, php/class-list-table.php:417, php/admin-menus/class-edit-menu.php:635
243+
#: php/class-list-table.php:163, php/class-list-table.php:415, php/admin-menus/class-edit-menu.php:635
244244
msgid "Export"
245245
msgstr ""
246246

247-
#: php/class-list-table.php:173, php/class-list-table.php:418, php/admin-menus/class-edit-menu.php:636
247+
#: php/class-list-table.php:172, php/class-list-table.php:416, php/admin-menus/class-edit-menu.php:636
248248
msgid "Delete"
249249
msgstr ""
250250

251-
#: php/class-list-table.php:177
251+
#: php/class-list-table.php:176
252252
msgid "You are about to permanently delete the selected item."
253253
msgstr ""
254254

255-
#: php/class-list-table.php:178, php/admin-menus/class-edit-menu.php:664
255+
#: php/class-list-table.php:177, php/admin-menus/class-edit-menu.php:664
256256
msgid "'Cancel' to stop, 'OK' to delete."
257257
msgstr ""
258258

259-
#: php/class-list-table.php:202
259+
#: php/class-list-table.php:201
260260
msgid "Run Once"
261261
msgstr ""
262262

263-
#: php/class-list-table.php:207, php/class-list-table.php:414
263+
#: php/class-list-table.php:206, php/class-list-table.php:412
264264
msgid "Network Deactivate"
265265
msgstr ""
266266

267-
#: php/class-list-table.php:207, php/class-list-table.php:413
267+
#: php/class-list-table.php:206, php/class-list-table.php:411
268268
msgid "Network Activate"
269269
msgstr ""
270270

271-
#: php/class-list-table.php:208, php/class-list-table.php:414, php/admin-menus/class-manage-menu.php:141, php/views/edit.php:104
271+
#: php/class-list-table.php:207, php/class-list-table.php:412, php/admin-menus/class-manage-menu.php:141, php/views/edit.php:104
272272
msgid "Deactivate"
273273
msgstr ""
274274

275-
#: php/class-list-table.php:208, php/class-list-table.php:413, php/admin-menus/class-manage-menu.php:140, php/views/edit.php:110
275+
#: php/class-list-table.php:207, php/class-list-table.php:411, php/admin-menus/class-manage-menu.php:140, php/views/edit.php:110
276276
msgid "Activate"
277277
msgstr ""
278278

279279
#. translators: %d: snippet identifier
280-
#: php/class-list-table.php:231
280+
#: php/class-list-table.php:230
281281
msgid "Untitled #%d"
282282
msgstr ""
283283

284-
#: php/class-list-table.php:255
284+
#: php/class-list-table.php:254
285285
msgid "Shared on Network"
286286
msgstr ""
287287

288-
#. translators: 1: date format, 2: time format
289-
#: php/class-list-table.php:343
290-
msgctxt "date and time format"
291-
msgid "%1$s \a\t %2$s"
292-
msgstr ""
293-
294288
#. translators: %s: Human-readable time difference.
295-
#: php/class-list-table.php:348
289+
#: php/class-list-table.php:343
296290
msgid "%s ago"
297291
msgstr ""
298292

299-
#: php/class-list-table.php:350
293+
#: php/class-list-table.php:345
300294
msgid "Y/m/d"
301295
msgstr ""
302296

303-
#: php/class-list-table.php:353
304-
msgid "Created"
305-
msgstr ""
306-
307-
#: php/class-list-table.php:353
308-
msgid "Last Modified"
297+
#. translators: 1: date format, 2: time format
298+
#: php/class-list-table.php:349
299+
msgctxt "date and time format"
300+
msgid "%1$s \a\t %2$s"
309301
msgstr ""
310302

311-
#: php/class-list-table.php:365, php/views/edit.php:80
303+
#: php/class-list-table.php:363, php/views/edit.php:80
312304
msgid "Name"
313305
msgstr ""
314306

315-
#: php/class-list-table.php:366
307+
#: php/class-list-table.php:364
316308
msgid "ID"
317309
msgstr ""
318310

319-
#: php/class-list-table.php:367, php/admin-menus/class-edit-menu.php:336
311+
#: php/class-list-table.php:365, php/admin-menus/class-edit-menu.php:336
320312
msgid "Description"
321313
msgstr ""
322314

323-
#: php/class-list-table.php:368, php/admin-menus/class-edit-menu.php:369
315+
#: php/class-list-table.php:366, php/admin-menus/class-edit-menu.php:369
324316
msgid "Tags"
325317
msgstr ""
326318

327-
#: php/class-list-table.php:369
328-
msgid "Date"
319+
#: php/class-list-table.php:367
320+
msgid "Modified"
329321
msgstr ""
330322

331-
#: php/class-list-table.php:370, php/admin-menus/class-edit-menu.php:388
323+
#: php/class-list-table.php:368, php/admin-menus/class-edit-menu.php:388
332324
msgid "Priority"
333325
msgstr ""
334326

335-
#: php/class-list-table.php:416, php/admin-menus/class-edit-menu.php:632
327+
#: php/class-list-table.php:414, php/admin-menus/class-edit-menu.php:632
336328
msgid "Download"
337329
msgstr ""
338330

339331
#. translators: %s: total number of snippets
340-
#: php/class-list-table.php:460
332+
#: php/class-list-table.php:458
341333
msgid "All <span class=\"count\">(%s)</span>"
342334
msgid_plural "All <span class=\"count\">(%s)</span>"
343335
msgstr[0] ""
344336
msgstr[1] ""
345337

346338
#. translators: %s: total number of active snippets
347-
#: php/class-list-table.php:463
339+
#: php/class-list-table.php:461
348340
msgid "Active <span class=\"count\">(%s)</span>"
349341
msgid_plural "Active <span class=\"count\">(%s)</span>"
350342
msgstr[0] ""
351343
msgstr[1] ""
352344

353345
#. translators: %s: total number of inactive snippets
354-
#: php/class-list-table.php:466
346+
#: php/class-list-table.php:464
355347
msgid "Inactive <span class=\"count\">(%s)</span>"
356348
msgid_plural "Inactive <span class=\"count\">(%s)</span>"
357349
msgstr[0] ""
358350
msgstr[1] ""
359351

360352
#. translators: %s: total number of recently activated snippets
361-
#: php/class-list-table.php:469
353+
#: php/class-list-table.php:467
362354
msgid "Recently Active <span class=\"count\">(%s)</span>"
363355
msgid_plural "Recently Active <span class=\"count\">(%s)</span>"
364356
msgstr[0] ""
365357
msgstr[1] ""
366358

367-
#: php/class-list-table.php:538
359+
#: php/class-list-table.php:536
368360
msgid "Show all tags"
369361
msgstr ""
370362

371-
#: php/class-list-table.php:552
363+
#: php/class-list-table.php:550
372364
msgid "Filter"
373365
msgstr ""
374366

375-
#: php/class-list-table.php:560
367+
#: php/class-list-table.php:558
376368
msgid "Clear List"
377369
msgstr ""
378370

379-
#: php/class-list-table.php:785
371+
#: php/class-list-table.php:783
380372
msgid "No snippets were found matching the current search query. Please enter a new query or use the \"Clear Filters\" button above."
381373
msgstr ""
382374

383-
#: php/class-list-table.php:788
375+
#: php/class-list-table.php:786
384376
msgid "It looks like you don't have any snippets."
385377
msgstr ""
386378

387-
#: php/class-list-table.php:792
379+
#: php/class-list-table.php:790
388380
msgid "Perhaps you would like to add a new one?"
389381
msgstr ""
390382

391-
#: php/class-list-table.php:1122
383+
#: php/class-list-table.php:1120
392384
msgid "Search results"
393385
msgstr ""
394386

395387
#. translators: 1: search query, 2: line number
396-
#: php/class-list-table.php:1130
388+
#: php/class-list-table.php:1128
397389
msgid " for &ldquo;%1$s&rdquo; on line %2$d"
398390
msgstr ""
399391

400392
#. translators: %s: search query
401-
#: php/class-list-table.php:1137
393+
#: php/class-list-table.php:1135
402394
msgid " for &ldquo;%s&rdquo;"
403395
msgstr ""
404396

405397
#. translators: %s: tag name
406-
#: php/class-list-table.php:1143
398+
#: php/class-list-table.php:1141
407399
msgid " in tag &ldquo;%s&rdquo;"
408400
msgstr ""
409401

410-
#: php/class-list-table.php:1151
402+
#: php/class-list-table.php:1149
411403
msgid "Clear Filters"
412404
msgstr ""
413405

414-
#: php/class-upgrade.php:145
406+
#: php/class-upgrade.php:149
407+
msgid "You can remove it, or edit it to add your own content."
408+
msgstr ""
409+
410+
#: php/class-upgrade.php:154
415411
msgid "Example HTML shortcode"
416412
msgstr ""
417413

418-
#: php/class-upgrade.php:148
414+
#: php/class-upgrade.php:157
419415
msgid "write your HTML shortcode content here"
420416
msgstr ""
421417

422-
#: php/class-upgrade.php:150
418+
#: php/class-upgrade.php:159
423419
msgid "This is an example snippet for demonstrating how to add an HTML shortcode."
424420
msgstr ""
425421

426-
#: php/class-upgrade.php:155
422+
#: php/class-upgrade.php:164
427423
msgid "Example CSS snippet"
428424
msgstr ""
429425

430-
#: php/class-upgrade.php:158
426+
#: php/class-upgrade.php:167
431427
msgid "write your CSS code here"
432428
msgstr ""
433429

434-
#: php/class-upgrade.php:160
430+
#: php/class-upgrade.php:169
435431
msgid "This is an example snippet for demonstrating how to add custom CSS code to your website."
436432
msgstr ""
437433

438-
#: php/class-upgrade.php:166
434+
#: php/class-upgrade.php:175
439435
msgid "Example JavaScript snippet"
440436
msgstr ""
441437

442-
#: php/class-upgrade.php:169
438+
#: php/class-upgrade.php:178
443439
msgid "write your JavaScript code here"
444440
msgstr ""
445441

446-
#: php/class-upgrade.php:171
442+
#: php/class-upgrade.php:180
447443
msgid "This is an example snippet for demonstrating how to add custom JavaScript code to your website."
448444
msgstr ""
449445

450-
#: php/class-upgrade.php:177
446+
#: php/class-upgrade.php:186
451447
msgid "Order snippets by name"
452448
msgstr ""
453449

454-
#: php/class-upgrade.php:179
450+
#: php/class-upgrade.php:188
455451
msgid "Order snippets by name by default in the snippets table."
456452
msgstr ""
457453

458-
#: php/class-upgrade.php:185
454+
#: php/class-upgrade.php:194
459455
msgid "Order snippets by date"
460456
msgstr ""
461457

462-
#: php/class-upgrade.php:187
458+
#: php/class-upgrade.php:197
463459
msgid "Order snippets by last modification date by default in the snippets table."
464460
msgstr ""
465461

466-
#: php/class-upgrade.php:196
467-
msgid "You can remove it, or edit it to add your own content."
468-
msgstr ""
469-
470462
#: php/class-validator.php:152
471463
msgid "Parse error: syntax error, unexpected end of snippet."
472464
msgstr ""

‎php/class-snippet.php

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -349,17 +349,10 @@ private function prepare_modified( $modified ) {
349349
}
350350

351351
/**
352-
* Retrieve the current date and time in MySQL format.
353-
*/
354-
public static function current_date() {
355-
return gmdate( Code_Snippet::DATE_FORMAT );
356-
}
357-
358-
/**
359-
* Update the last modification date to the current time.
352+
* Update the last modification date to the current date and time.
360353
*/
361354
public function update_modified() {
362-
$this->modified = self::current_date();
355+
$this->modified = gmdate( Code_Snippet::DATE_FORMAT );
363356
}
364357

365358
/**

‎php/snippet-ops.php

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -206,13 +206,7 @@ function activate_snippet( $id, $multisite = null ) {
206206
return false;
207207
}
208208

209-
$wpdb->update(
210-
$table,
211-
array( 'active' => '1', 'modified' => Code_Snippet::current_date() ),
212-
array( 'id' => $id ),
213-
array( '%d', '%s' ),
214-
array( '%d' )
215-
);
209+
$wpdb->update( $table, array( 'active' => '1' ), array( 'id' => $id ), array( '%d' ), array( '%d' ) );
216210

217211
/* Remove snippet from shared network snippet list if it was Network Activated */
218212
if ( $table === $db->ms_table && $shared_network_snippets = get_site_option( 'shared_network_snippets', false ) ) {
@@ -269,11 +263,8 @@ function activate_snippets( array $ids, $multisite = null ) {
269263

270264
/* Build a SQL query containing all the valid snippet IDs and activate the valid snippets */
271265
$ids_format = implode( ',', array_fill( 0, count( $valid_ids ), '%d' ) );
272-
$sql = sprintf( 'UPDATE %s SET active = 1, modified = %%s WHERE id IN (%s);', $table, $ids_format );
273-
274-
array_unshift( $valid_ids, Code_Snippet::current_date() );
266+
$sql = sprintf( 'UPDATE %s SET active = 1 WHERE id IN (%s);', $table, $ids_format );
275267
$wpdb->query( $wpdb->prepare( $sql, $valid_ids ) );
276-
array_shift( $valid_ids );
277268

278269
/* Remove snippet from shared network snippet list if it was Network Activated */
279270
if ( $table === $db->ms_table && $shared_network_snippets = get_site_option( 'shared_network_snippets', false ) ) {
@@ -303,13 +294,7 @@ function deactivate_snippet( $id, $multisite = null ) {
303294

304295
/* Set the snippet to active */
305296

306-
$wpdb->update(
307-
$table,
308-
array( 'active' => '0', 'modified' => Code_Snippet::current_date() ),
309-
array( 'id' => $id ),
310-
array( '%d', '%s' ),
311-
array( '%d' )
312-
);
297+
$wpdb->update( $table, array( 'active' => '0' ), array( 'id' => $id ), array( '%d' ), array( '%d' ) );
313298

314299
/* Update the recently active list */
315300

0 commit comments

Comments
 (0)