Changeset 1068383

Timestamp:

01/15/2015 07:47:28 AM (11 years ago)

Author:

Askelon

Message:

"Version 2.1.3.1"

Location:

wpmovielibrary/trunk

Files:

• admin/class-wpmoly-edit-movies.php (modified) (2 diffs)
• assets/css/admin/wpmoly-edit-movies.css (modified) (2 diffs)
• assets/css/public/wpmoly.css (modified) (2 diffs)
• assets/fonts/wpmovielibrary/fonts/wpmovielibrary.eot (modified) (previous)
• assets/fonts/wpmovielibrary/fonts/wpmovielibrary.svg (modified) (2 diffs)
• assets/fonts/wpmovielibrary/fonts/wpmovielibrary.ttf (modified) (previous)
• assets/fonts/wpmovielibrary/fonts/wpmovielibrary.woff (modified) (previous)
• assets/fonts/wpmovielibrary/style.css (modified) (4 diffs)
• includes/classes/class-wpmoly-formatting-meta.php (modified) (1 diff)
• includes/classes/class-wpmoly-utils.php (modified) (4 diffs)
• public/class-wpmoly-archives.php (modified) (1 diff)
• public/class-wpmoly-grid.php (modified) (1 diff)
• readme.txt (modified) (2 diffs)
• wpmovielibrary.php (modified) (2 diffs)

wpmovielibrary/trunk/admin/class-wpmoly-edit-movies.php

@@ -765 +765 @@
 
             foreach ( $movie_meta as $slug => $meta )
-                update_post_meta( $post_id, "_wpmoly_movie_{$slug}", $meta );
+                $update = update_post_meta( $post_id, "_wpmoly_movie_{$slug}", $meta );
 
             if ( false !== $clean )
@@ -979 +979 @@
 
                 $wpmoly_details = $_REQUEST['wpmoly_details'];
-                self::save_movie_details( $post_ID, $wpmoly_details );
+                if ( true === $_REQUEST['is_bulkedit'] ) {
+                    foreach ( $_REQUEST['post'] as $post_id ) {
+                        self::save_movie_details( $post_id, $wpmoly_details );
+                    }
+                } else {
+                    self::save_movie_details( $post_ID, $wpmoly_details );
+                }
             }
 

wpmovielibrary/trunk/assets/css/admin/wpmoly-edit-movies.css

@@ -176 +176 @@
 #wpmoly-meta-panels .wpmoly-details-item {
     display: inline-table;
-    width: 33%;
+    margin: 0 0.5%;
+    width: 32%;
 }
 
 #wpmoly-meta-panels .wpmoly-details-item-title {
+    border-bottom: 1px solid #ddd;
     margin-bottom: 0.25rem;
     margin-left: 0.1rem;
+    padding-bottom: 0.25em;
+    position: relative;
 }
 
@@ -191 +195 @@
 
 #wpmoly-meta-panels .wpmoly-details-item .select2-container {
-    width: 90% !important;
+    width: 100% !important;
 }
 

wpmovielibrary/trunk/assets/css/public/wpmoly.css

@@ -272 +272 @@
     background-repeat: no-repeat;
     background-size: 100% auto;
+    clear: both;
     position: relative;
 }
@@ -556 +557 @@
 }
 
-.wpmoly.headbox.movie.title > span + span,
-.wpmoly.headbox.movie.subtitle > span + span,
-.wpmoly.headbox.movie.details-1 > span + span,
-.wpmoly.headbox.movie.details-2 > span + span,
-.wpmoly.headbox.movie.details-3 > span + span {
+.wpmoly.headbox.movie.title > span:not(.empty) + span,
+.wpmoly.headbox.movie.subtitle > span:not(.empty) + span,
+.wpmoly.headbox.movie.details-1 > span:not(.empty) + span,
+.wpmoly.headbox.movie.details-2 > span:not(.empty) + span,
+.wpmoly.headbox.movie.details-3 > span:not(.empty) + span {
     border-left: 1px solid #888;
     margin-left: 6px;

wpmovielibrary/trunk/assets/fonts/wpmovielibrary/fonts/wpmovielibrary.svg

@@ -112 +112 @@
 <glyph unicode="&#xe666;" d="M498.893 425.293l-118.502-193.049c-4.403-7.142-13.005-8.32-19.149-2.586l-57.293 53.657c-6.144 5.734-14.95 4.71-19.61-2.304l-80.461-121.344c-4.633-6.989-13.517-8.089-19.738-2.457l-37.453 34.202c-6.221 5.658-15.59 4.915-20.838-1.613l-117.99-147.149c-5.274-6.579-2.688-11.93 5.683-11.93h493.337v392.32c0.026 8.423-3.584 9.447-7.987 2.253z" />
 <glyph unicode="&#xe667;" d="M426.189 354.739l-230.349 118.758c-31.565 16.614-93.773-15.488-111.641-43.75-7.962-12.647-7.398-21.76-7.398-26.931l2.841-268.16c0.179-5.709 7.373-13.363 13.491-17.152 12.775-7.834 206.336-128.64 211.789-132.070 2.944-1.843 6.451-2.688 9.882-2.688 2.918 0 5.863 0.64 8.525 1.971 5.837 2.867 9.472 8.397 9.472 14.464v281.626c0 5.862-3.43 11.264-9.011 14.208l-209.357 116.889c2.355 4.608 11.674 14.336 28.8 23.296 18.048 9.472 31.539 5.888 34.637 4.685 0 0 200.96-107.546 207.104-110.745 6.118-3.2 6.247-3.687 6.247-9.139 0-5.478 0-267.264 0-267.264 0-13.337 13.517-18.791 23.475-18.791 9.907 0 20.505 9.728 20.505 18.791v287.795c0 5.862-3.456 11.289-9.011 14.208z" />
+<glyph unicode="&#xe668;" d="M404.505 281.549h-46.106v35.84c0 74.163-34.151 117.76-102.4 117.76-68.224 0-102.4-43.597-102.4-117.76v-35.84h-51.2c-14.131 0-25.6-16.563-25.6-30.72v-199.68c0-14.080 10.983-29.159 24.371-33.459l30.617-9.907c13.389-4.327 35.865-7.859 49.971-7.859h148.48c14.080 0 36.582 3.533 49.971 7.859l30.618 9.907c13.414 4.301 24.371 19.379 24.371 33.459v199.68c0 14.157-16.563 30.72-30.695 30.72zM204.8 327.629c0 36.992 20.429 56.32 51.2 56.32 30.797 0 51.2-19.328 51.2-56.32v-46.080h-102.4v46.080z" />
+<glyph unicode="&#xe669;" d="M404.48 281.6h-46.080v61.44c0 74.163-34.176 117.76-102.4 117.76-68.25 0-102.4-43.597-102.4-117.76v-10.24h51.2v20.48c0 36.992 20.403 56.32 51.2 56.32 30.771 0 51.2-19.328 51.2-56.32v-71.68h-204.8c-14.157 0-25.6-16.563-25.6-30.72v-199.68c0-14.080 10.983-29.133 24.371-33.459l30.617-9.907c13.415-4.301 35.891-7.834 49.971-7.834h148.48c14.106 0 36.582 3.533 49.971 7.859l30.618 9.907c13.389 4.301 24.371 19.353 24.371 33.433v199.68c0 14.157-16.563 30.72-30.72 30.72z" />
+<glyph unicode="&#xe66a;" d="M84.806 60.93c0-14.677-12.222-26.575-27.297-26.575s-27.297 11.898-27.297 26.575c0 14.677 12.221 26.575 27.297 26.575s27.297-11.898 27.297-26.575zM235.726 49.625c0-31.062-25.865-56.242-57.771-56.242s-57.771 25.18-57.771 56.242c0 31.062 25.865 56.242 57.771 56.242s57.771-25.18 57.771-56.242zM144.198 140.493c0-15.7-13.074-28.428-29.201-28.428s-29.201 12.728-29.201 28.428c0 15.7 13.074 28.428 29.201 28.428s29.201-12.728 29.201-28.428zM283.115 209.663c0-28.27-23.541-51.188-52.58-51.188s-52.58 22.918-52.58 51.188c0 28.27 23.541 51.188 52.58 51.188s52.58-22.918 52.58-51.188zM287.452 112.070c0-15.301-12.741-27.705-28.459-27.705s-28.459 12.404-28.459 27.706c0 15.301 12.742 27.706 28.459 27.706s28.459-12.404 28.459-27.706zM394.865 126.562c0-21.57-17.962-39.056-40.118-39.056s-40.118 17.486-40.118 39.056c0 21.57 17.962 39.056 40.118 39.056s40.118-17.486 40.118-39.056zM409.852 247.781c0-29.628-24.671-53.647-55.105-53.647s-55.105 24.019-55.105 53.647c0 29.628 24.671 53.647 55.105 53.647s55.105-24.019 55.105-53.647zM409.852 350.3c0-16.309-13.58-29.529-30.332-29.529s-30.332 13.22-30.332 29.529c0 16.308 13.58 29.529 30.332 29.529s30.332-13.22 30.332-29.529zM474.021 342.111c0-11.786-9.814-21.339-21.92-21.339s-21.92 9.554-21.92 21.339c0 11.786 9.814 21.339 21.92 21.339s21.92-9.554 21.92-21.339zM461.594 263.128c0-11.786-9.814-21.339-21.92-21.339s-21.92 9.554-21.92 21.339c0 11.786 9.814 21.339 21.92 21.339s21.92-9.554 21.92-21.339zM482.822 413.645c0-23.199-19.318-42.005-43.148-42.005s-43.148 18.807-43.148 42.005c0 23.199 19.318 42.006 43.148 42.006s43.148-18.807 43.148-42.006z" />
 <glyph unicode="&#xf009;" d="M0 73.143v109.714q0 14.857 10.857 25.714t25.715 10.857h146.286q14.857 0 25.714-10.857t10.857-25.714v-109.714q0-14.857-10.857-25.714t-25.714-10.857h-146.286q-14.857 0-25.715 10.857t-10.857 25.714zM0 292.572v109.714q0 14.857 10.857 25.715t25.715 10.857h146.286q14.857 0 25.714-10.857t10.857-25.715v-109.714q0-14.857-10.857-25.714t-25.714-10.857h-146.286q-14.857 0-25.715 10.857t-10.857 25.714zM256 73.143v109.714q0 14.857 10.857 25.714t25.714 10.857h146.286q14.857 0 25.714-10.857t10.857-25.714v-109.714q0-14.857-10.857-25.714t-25.714-10.857h-146.286q-14.857 0-25.714 10.857t-10.857 25.714zM256 292.572v109.714q0 14.857 10.857 25.715t25.714 10.857h146.286q14.857 0 25.714-10.857t10.857-25.715v-109.714q0-14.857-10.857-25.714t-25.714-10.857h-146.286q-14.857 0-25.714 10.857t-10.857 25.714z" horiz-adv-x="476" />
 <glyph unicode="&#xf00a;" d="M0 64v54.857q0 11.428 8 19.428t19.428 8h91.428q11.429 0 19.429-8t8-19.428v-54.857q0-11.428-8-19.428t-19.428-8h-91.428q-11.428 0-19.428 8t-8 19.428zM0 210.286v54.857q0 11.429 8 19.429t19.428 8h91.428q11.429 0 19.429-8t8-19.428v-54.857q0-11.428-8-19.428t-19.428-8h-91.428q-11.428 0-19.428 8t-8 19.428zM0 356.572v54.857q0 11.428 8 19.428t19.428 8h91.428q11.429 0 19.429-8t8-19.428v-54.857q0-11.428-8-19.428t-19.428-8h-91.428q-11.428 0-19.428 8t-8 19.428zM182.857 64v54.857q0 11.428 8 19.428t19.429 8h91.428q11.428 0 19.428-8t8-19.428v-54.857q0-11.428-8-19.428t-19.428-8h-91.428q-11.428 0-19.428 8t-8 19.428zM182.857 210.286v54.857q0 11.429 8 19.429t19.429 8h91.428q11.428 0 19.428-8t8-19.428v-54.857q0-11.428-8-19.428t-19.428-8h-91.428q-11.428 0-19.428 8t-8 19.428zM182.857 356.572v54.857q0 11.428 8 19.428t19.429 8h91.428q11.428 0 19.428-8t8-19.428v-54.857q0-11.428-8-19.428t-19.428-8h-91.428q-11.428 0-19.428 8t-8 19.428zM365.714 64v54.857q0 11.428 8 19.428t19.428 8h91.428q11.428 0 19.428-8t8-19.428v-54.857q0-11.428-8-19.428t-19.428-8h-91.428q-11.428 0-19.428 8t-8 19.428zM365.714 210.286v54.857q0 11.429 8 19.429t19.428 8h91.428q11.428 0 19.428-8t8-19.428v-54.857q0-11.428-8-19.428t-19.428-8h-91.428q-11.428 0-19.428 8t-8 19.428zM365.714 356.572v54.857q0 11.428 8 19.428t19.428 8h91.428q11.428 0 19.428-8t8-19.428v-54.857q0-11.428-8-19.428t-19.428-8h-91.428q-11.428 0-19.428 8t-8 19.428z" />
@@ -123 +126 @@
 <glyph unicode="&#xf03a;" d="M0 45.714v54.857q0 3.714 2.715 6.428t6.429 2.714h54.857q3.715 0 6.428-2.714t2.715-6.428v-54.857q0-3.714-2.715-6.428t-6.428-2.714h-54.857q-3.715 0-6.428 2.714t-2.715 6.428zM0 155.429v54.857q0 3.714 2.715 6.428t6.429 2.714h54.857q3.715 0 6.428-2.714t2.715-6.428v-54.857q0-3.714-2.715-6.428t-6.428-2.714h-54.857q-3.715 0-6.428 2.714t-2.715 6.428zM0 265.143v54.857q0 3.714 2.715 6.429t6.429 2.714h54.857q3.715 0 6.428-2.714t2.715-6.428v-54.857q0-3.714-2.715-6.428t-6.428-2.714h-54.857q-3.715 0-6.428 2.714t-2.715 6.428zM0 374.857v54.857q0 3.715 2.715 6.429t6.429 2.714h54.857q3.715 0 6.428-2.714t2.715-6.429v-54.857q0-3.714-2.715-6.428t-6.428-2.715h-54.857q-3.715 0-6.428 2.715t-2.715 6.428zM109.715 45.714v54.857q0 3.714 2.715 6.428t6.428 2.714h384q3.714 0 6.428-2.714t2.714-6.428v-54.857q0-3.714-2.714-6.428t-6.428-2.714h-384q-3.715 0-6.428 2.714t-2.715 6.428zM109.715 155.429v54.857q0 3.714 2.715 6.428t6.428 2.714h384q3.714 0 6.428-2.714t2.714-6.428v-54.857q0-3.714-2.714-6.428t-6.428-2.714h-384q-3.715 0-6.428 2.714t-2.715 6.428zM109.715 265.143v54.857q0 3.714 2.715 6.429t6.428 2.714h384q3.714 0 6.428-2.714t2.714-6.428v-54.857q0-3.714-2.714-6.428t-6.428-2.714h-384q-3.715 0-6.428 2.714t-2.715 6.428zM109.715 374.857v54.857q0 3.715 2.715 6.429t6.428 2.714h384q3.714 0 6.428-2.714t2.714-6.429v-54.857q0-3.714-2.714-6.428t-6.428-2.715h-384q-3.715 0-6.428 2.715t-2.715 6.428z" />
 <glyph unicode="&#xf03e;" d="M0 45.714v347.428q0 18.857 13.428 32.286t32.285 13.428h457.143q18.857 0 32.285-13.428t13.428-32.286v-347.428q0-18.857-13.428-32.286t-32.286-13.428h-457.143q-18.857 0-32.285 13.428t-13.428 32.286zM36.572 45.714q0-3.714 2.715-6.428t6.428-2.714h457.143q3.714 0 6.428 2.714t2.715 6.428v347.428q0 3.714-2.714 6.428t-6.428 2.714h-457.143q-3.715 0-6.428-2.714t-2.715-6.428v-347.428zM73.143 73.143v54.857l91.429 91.428 45.714-45.714 146.286 146.286 118.857-118.857v-128h-402.286zM73.143 310.857q0 22.857 16 38.857t38.857 16 38.857-16 16-38.857-16-38.857-38.857-16-38.857 16-16 38.857z" horiz-adv-x="549" />
-<glyph unicode="&#xf069;" d="M35 153.286q3.857 14.714 17 22.143l76 44-76 44q-13.143 7.428-17 22.143t3.572 27.857l18.285 31.428q7.428 13.143 22.143 17t27.857-3.572l76-43.714v87.714q0 14.857 10.857 25.714t25.714 10.857h36.572q14.857 0 25.714-10.857t10.857-25.714v-87.714l76 43.714q13.143 7.428 27.857 3.572t22.143-17l18.286-31.428q7.428-13.143 3.572-27.857t-17-22.143l-76-44 76-44q13.143-7.428 17-22.143t-3.572-27.857l-18.286-31.428q-7.428-13.143-22.143-17t-27.857 3.572l-76 43.714v-87.714q0-14.857-10.857-25.714t-25.714-10.857h-36.572q-14.857 0-25.714 10.857t-10.857 25.714v87.714l-76-43.714q-13.143-7.428-27.857-3.572t-22.143 17l-18.285 31.428q-7.428 13.143-3.572 27.857z" horiz-adv-x="476" />
 <glyph unicode="&#xf085;" d="M0 193.429v52.857q0 2.857 2 5.572t4.572 3l44.285 6.857q3.143 10 9.143 21.715-9.715 13.714-25.715 32.857-2 3.143-2 5.714 0 3.429 2 5.714 6.285 8.572 23.428 25.428t22.572 16.857q3.143 0 6-2l32.857-25.714q9.715 5.143 22 9.143 3.143 30.857 6.572 44 2 6.857 8.572 6.857h53.143q3.143 0 5.714-2.143t2.857-5l6.572-43.714q9.714-2.857 21.428-8.857l33.714 25.428q2.286 2 5.714 2 3.143 0 6-2.286 41.143-38 41.143-45.714 0-2.572-2-5.428-3.428-4.572-12-15.428t-12.857-17.143q6.572-13.714 9.714-23.428l43.428-6.572q2.857-0.572 4.857-3t2-5.572v-52.857q0-2.857-2-5.572t-4.572-3l-44.286-6.857q-3.143-10-9.143-21.714 9.714-13.714 25.714-32.857 2-2.857 2-5.714 0-3.428-2-5.428-6.572-8.572-23.572-25.572t-22.428-17q-3.143 0-6 2l-32.857 25.714q-10.571-5.428-22-8.857-3.143-30.857-6.571-44.286-2-6.857-8.572-6.857h-53.143q-3.143 0-5.714 2.143t-2.857 5l-6.572 43.714q-9.714 2.857-21.428 8.857l-33.715-25.428q-2-2-5.715-2-3.143 0-6 2.286-41.143 38-41.143 45.714 0 2.572 2 5.428 2.857 4 11.715 15.143t13.428 17.428q-6.572 12.572-10 23.428l-43.428 6.857q-2.857 0.286-4.857 2.714t-2 5.572zM109.715 219.429q0-30.286 21.428-51.714t51.715-21.428 51.714 21.428 21.428 51.714-21.428 51.714-51.714 21.428-51.714-21.428-21.428-51.714zM329.143 53.143v40q0 4.572 42.572 8.857 3.714 8.286 8.572 14.857-14.572 32.286-14.572 39.428 0 1.143 1.143 2 1.143 0.572 10 5.714t16.857 9.714 8.572 4.572q2.286 0 13.143-13.286t14.857-19.286q5.714 0.572 8.572 0.572t8.572-0.572q14.572 20.286 26.286 32l1.714 0.572q1.143 0 35.428-20 1.143-0.857 1.143-2 0-7.143-14.572-39.428 4.857-6.572 8.572-14.857 42.572-4.286 42.572-8.857v-40q0-4.572-42.572-8.857-3.428-7.714-8.572-14.857 14.572-32.286 14.572-39.428 0-1.143-1.143-2-34.857-20.286-35.428-20.286-2.286 0-13.143 13.429t-14.857 19.428q-5.714-0.572-8.572-0.572t-8.572 0.572q-4-6-14.857-19.428t-13.143-13.429q-0.572 0-35.428 20.286-1.143 0.857-1.143 2 0 7.143 14.572 39.428-5.143 7.143-8.572 14.857-42.572 4.286-42.572 8.857zM329.143 345.714v40q0 4.571 42.572 8.857 3.714 8.286 8.572 14.857-14.572 32.285-14.572 39.428 0 1.143 1.143 2 1.143 0.572 10 5.714t16.857 9.714 8.572 4.572q2.286 0 13.143-13.286t14.857-19.285q5.714 0.571 8.572 0.571t8.572-0.571q14.572 20.286 26.286 32l1.714 0.571q1.143 0 35.428-20 1.143-0.857 1.143-2 0-7.143-14.572-39.428 4.857-6.572 8.572-14.857 42.572-4.286 42.572-8.857v-40q0-4.571-42.572-8.857-3.428-7.714-8.572-14.857 14.572-32.285 14.572-39.428 0-1.143-1.143-2-34.857-20.286-35.428-20.286-2.286 0-13.143 13.428t-14.857 19.428q-5.714-0.572-8.572-0.572t-8.572 0.572q-4-6-14.857-19.428t-13.143-13.428q-0.572 0-35.428 20.286-1.143 0.857-1.143 2 0 7.143 14.572 39.428-5.143 7.143-8.572 14.857-42.572 4.286-42.572 8.857zM402.286 73.143q0-15.143 10.714-25.857t25.857-10.714 25.857 10.714 10.714 25.857q0 14.857-10.857 25.714t-25.714 10.857-25.714-10.857-10.857-25.714zM402.286 365.714q0-15.143 10.714-25.857t25.857-10.714 25.857 10.714 10.714 25.857q0 14.857-10.857 25.715t-25.714 10.857-25.714-10.857-10.857-25.715z" horiz-adv-x="549" />
 <glyph unicode="&#xf0b0;" d="M1.429 391.143q4.857 11.143 16.857 11.143h365.714q12 0 16.857-11.143 4.857-11.714-4-20l-140.857-140.857v-212q0-12-11.143-16.857-3.714-1.428-7.143-1.428-7.714 0-12.857 5.428l-73.143 73.143q-5.429 5.428-5.429 12.857v138.857l-140.857 140.857q-8.857 8.286-4 20z" horiz-adv-x="403" />

wpmovielibrary/trunk/assets/fonts/wpmovielibrary/style.css

@@ -1 +1 @@
 @font-face {
     font-family: 'wpmovielibrary';
-    src:url('fonts/wpmovielibrary.eot?-xwucb1');
-    src:url('fonts/wpmovielibrary.eot?#iefix-xwucb1') format('embedded-opentype'),
-        url('fonts/wpmovielibrary.woff?-xwucb1') format('woff'),
-        url('fonts/wpmovielibrary.ttf?-xwucb1') format('truetype'),
-        url('fonts/wpmovielibrary.svg?-xwucb1#wpmovielibrary') format('svg');
+    src:url('fonts/wpmovielibrary.eot?3a4gff');
+    src:url('fonts/wpmovielibrary.eot?#iefix3a4gff') format('embedded-opentype'),
+        url('fonts/wpmovielibrary.woff?3a4gff') format('woff'),
+        url('fonts/wpmovielibrary.ttf?3a4gff') format('truetype'),
+        url('fonts/wpmovielibrary.svg?3a4gff#wpmovielibrary') format('svg');
     font-weight: normal;
     font-style: normal;
@@ -24 +24 @@
 }
 
+.icon-vfx:before {
+    content: "\e66a";
+}
+
 .icon-actor:before {
     content: "\e60c";
@@ -284 +288 @@
 }
 
-.icon-asterisk:before {
-    content: "\f069";
-}
-
 .icon-cogs:before {
     content: "\f085";
@@ -460 +460 @@
 }
 
+.icon-lock:before {
+    content: "\e668";
+}
+
+.icon-lock-open:before {
+    content: "\e669";
+}
+
 .icon-erase:before {
     content: "\e63d";

wpmovielibrary/trunk/includes/classes/class-wpmoly-formatting-meta.php

@@ -141 +141 @@
                 $format = 'G \h i \m\i\n';
 
+            $data = intval( $data );
             $output = date_i18n( $format, mktime( 0, $data ) );
             if ( false !== stripos( $output, 'am' ) || false !== stripos( $output, 'pm' ) )

wpmovielibrary/trunk/includes/classes/class-wpmoly-utils.php

@@ -1203 +1203 @@
 
             // Term ordering is killing quick/bulk edit, avoid it
-            if ( is_admin() && ( ! function_exists( 'get_current_screen' ) || 'edit-movie' == get_current_screen()->id ) )
+            if ( is_admin() && ( function_exists( 'get_current_screen' ) && 'edit-movie' == get_current_screen()->id ) )
                 return $terms;
 
@@ -1235 +1235 @@
         public static function get_ordered_object_terms( $terms, $object_ids, $taxonomies, $args ) {
 
+            $total = count( $terms );
+            $original_terms = $terms;
+
             // Term ordering is killing quick/bulk edit, avoid it
-            if ( is_admin() && ( ! function_exists( 'get_current_screen' ) || 'edit-movie' == get_current_screen()->id ) )
+            if ( is_admin() && ( function_exists( 'get_current_screen' ) && 'edit-movie' == get_current_screen()->id ) )
                 return $terms;
 
-            global $wpdb;
-
             $taxonomies = explode( ', ', str_replace( "'", "", $taxonomies ) );
-
             if ( empty( $object_ids ) || ( $taxonomies != "'collection', 'actor', 'genre'" && ( ! in_array( 'collection', $taxonomies ) && ! in_array( 'actor', $taxonomies ) && ! in_array( 'genre', $taxonomies ) ) ) )
                 return $terms;
+
+            global $wpdb;
 
             foreach ( (array) $taxonomies as $taxonomy ) {
@@ -1264 +1266 @@
                     if ( isset($t->args) && is_array($t->args) && $args != array_merge($args, $t->args) ) {
                         unset($taxonomies[$index]);
-                        $terms = array_merge($terms, $this->get_ordered_object_terms($object_ids, $taxonomy, array_merge($args, $t->args)));
+                        $terms = array_merge($terms, self::get_ordered_object_terms($object_ids, $taxonomy, array_merge($args, $t->args)));
                     }
                 }
@@ -1320 +1322 @@
                 $terms = array();
 
+            if ( $total != count( $terms ) )
+                $terms = $original_terms;
+
             return $terms;
         }

wpmovielibrary/trunk/public/class-wpmoly-archives.php

@@ -707 +707 @@
             $attributes['urls'] = $urls;
 
-            $content = self::render_template( 'archives/menu.php', $attributes );
+            $content = self::render_template( 'archives/menu.php', $attributes, $require = 'always' );
 
             return $content;

wpmovielibrary/trunk/public/class-wpmoly-grid.php

@@ -111 +111 @@
                 $attributes['theme'] = '';
 
-            $content = self::render_template( 'movies/grid/menu.php', $attributes );
+            $content = self::render_template( 'movies/grid/menu.php', $attributes, $require = 'always' );
 
             return $content;

wpmovielibrary/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.8
 Tested up to: 4.1
-Stable tag: 2.1.3
+Stable tag: 2.1.3.1
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
@@ -138 +138 @@
 
 == Changelog ==
+
+= 2.1.3.1 =
+* Fix - Terms ordering minor bug fix
+* Fix - Minor archives menu bug fix
+* Fix - Runtime formatting bug when using strings
+* Tweak - Bulk edit and metabox minor updates
+* Tweak - Font update + minor style tweaks
+* Dev - Smoother terms ordering process
 
 = 2.1.3 =

wpmovielibrary/trunk/wpmovielibrary.php

@@ -18 +18 @@
  * Plugin URI:  http://wpmovielibrary.com
  * Description: A WordPress Plugin to manage a personnal library of movies.
- * Version:     2.1.3
+ * Version:     2.1.3.1
  * Author:      Charlie MERLAND
  * Author URI:  http://www.caercam.org/
@@ -35 +35 @@
 define( 'WPMOLY_PLUGIN',                 plugin_basename( __FILE__ ) );
 define( 'WPMOLY_NAME',                   'WPMovieLibrary' );
-define( 'WPMOLY_VERSION',                '2.1.3' );
+define( 'WPMOLY_VERSION',                '2.1.3.1' );
 define( 'WPMOLY_SLUG',                   'wpmoly' );
 define( 'WPMOLY_URL',                    plugins_url( basename( __DIR__ ) ) );