Changeset 3081:2d7b794a32c3

Timestamp:

08/18/15 21:27:07 (10 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Parents:

3078:2980b7408547 (diff), 3080:4afa4b38a042 (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:

Merge bugfix from 2.8 branch

Location:

inc

Files:

• admin/lib.dc.page.php (modified) (2 diffs)
• admin/lib.dc.page.php (modified) (2 diffs)
• prepend.php (modified) (1 diff)

inc/admin/lib.dc.page.php

@@ -946 +946 @@
      }
 
-     public static function getPF($file) {
+     public static function getPF($file)
+     {
           return $GLOBALS['core']->adminurl->get('load.plugin.file',array('pf' => $file));
      }
 
-     public static function setXFrameOptions($origin=null) {
+     public static function setXFrameOptions($origin = null)
+     {
           if (self::$xframe_loaded) {
                return;
@@ -956 +958 @@
           if ($origin !== null) {
                $url = parse_url($origin);
-               header(sprintf('X-Frame-Options: %s', is_array($url)?("ALLOW-FROM ".$url['scheme'].'://'.$url['host']):'SAMEORIGIN'));
+               header(sprintf('X-Frame-Options: %s',is_array($url) ?
+                    ("ALLOW-FROM ".(isset($url['scheme']) ? $url['scheme'].':' : '' ).'//'.$url['host']) :
+                    'SAMEORIGIN'));
           } else {
                header('X-Frame-Options: SAMEORIGIN'); // FF 3.6.9+ Chrome 4.1+ IE 8+ Safari 4+ Opera 10.5+
           }
           self::$xframe_loaded = true;
-
      }
 }

inc/admin/lib.dc.page.php

@@ -177 +177 @@
           }
 
-          // Display breadcrumb (if given) before any error message
+          // Display breadcrumb (if given) before any error messages
           echo $breadcrumb;
 
-          if ($core->error->flag()) {
-               echo
-               '<div class="error"><p><strong>'.(count($core->error->getErrors()) > 1 ? __('Errors:') : __('Error:')).'</strong></p>'.
+          // Display notices and errors
+          echo self::notices();
+     }
+
+     public static function notices()
+     {
+          global $core;
+          static $error_displayed = false;
+          $res = '';
+
+          // return error messages if any
+          if ($core->error->flag() && !$error_displayed) {
+               $res .= '<div class="error"><p><strong>'.(count($core->error->getErrors()) > 1 ? __('Errors:') : __('Error:')).'</strong></p>'.
                $core->error->toHTML().
                '</div>';
-          }
-
-          // Display notices
-          echo self::notices();
-     }
-
-     public static function notices()
-     {
+               $error_displayed = true;
+          }
+
           // return notices if any
-          $res = '';
           if (isset($_SESSION['notifications'])) {
-               $notifications = $_SESSION['notifications'];
                foreach ($_SESSION['notifications'] as $notification) {
                     $res .= self::getNotification($notification);
@@ -366 +369 @@
           echo $breadcrumb;
 
-          if ($core->error->flag()) {
-               echo
-               '<div class="error" role="alert"><strong>'.__('Errors:').'</strong>'.
-               $core->error->toHTML().
-               '</div>';
-          }
+          // Display notices and errors
+          echo self::notices();
      }
 

inc/prepend.php

@@ -140 +140 @@
 # Constants
 define('DC_ROOT',path::real(dirname(__FILE__).'/..'));
-define('DC_VERSION','2.8.1');
+define('DC_VERSION','2.9-dev');
 define('DC_DIGESTS',dirname(__FILE__).'/digests');
 define('DC_L10N_ROOT',dirname(__FILE__).'/../locales');