Changeset 1836:176d311e56a7 for inc/admin/lib.dc.page.php

Timestamp:

09/13/13 19:43:58 (12 years ago)

Author:

kevin@…

Branch:

Ticket #1539

Children:

1837:bc086634dac8, 1838:175f854b4403

Parents:

1835:047d8d2aae0f (diff), 1809:626295167332 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Ticket #1539 Fusion avec default

Files:

• inc/admin/lib.dc.page.php (modified) (1 diff)
• inc/admin/lib.dc.page.php (modified) (1 diff)

inc/admin/lib.dc.page.php

@@ -585 +585 @@
           self::jsVar('dotclear.msg.xhtml_not_valid',
                __('There are XHTML markup errors.')).
+          self::jsVar('dotclear.msg.warning_validate_no_save_content',
+               __('Attention: an audit of a content not yet registered.')).
           self::jsVar('dotclear.msg.confirm_change_post_format',
                __('You have unsaved changes. Switch post format will loose these changes. Proceed anyway?')).

inc/admin/lib.dc.page.php

@@ -482 +482 @@
      {
           $mute_or_no = '';
-          if (!empty($GLOBALS['core']->blog->settings->system->jquery_migrate_mute)) {
+          if (!empty($GLOBALS['core']->blog->settings->system->jquery_migrate_mute) // for initial setting
+               || $GLOBALS['core']->blog->settings->system->jquery_migrate_mute) {
                $mute_or_no .=
                     '<script type="text/javascript">'."\n".