Changeset 17:6fc4226eaebd for inc

Timestamp:

04/27/11 16:30:40 (14 years ago)

Author:

Dsls <dsls@…>

Branch:

default

Children:

18:3b981ecb888d, 67:a5f9c67df8fe, 126:2be2ac72171e

Message:

Temporarily removed safe_mode on stable branch, will work on it on dedicated branch before further merge.

Location:

inc

Files:

• admin/lib.dc.page.php (modified) (1 diff)
• core/class.dc.modules.php (modified) (2 diffs)

inc/admin/lib.dc.page.php

@@ -128 +128 @@
           '<div id="main">'."\n".
           '<div id="content">'."\n";
-          
-          # Recovery mode
-          if (isset($_SESSION['sess_safe_mode']) && $_SESSION['sess_safe_mode'])
-          {
-               echo
-               '<div class="error"><h3>'.__('Recovery mode').'</h3>'.
-               '<p>'.__('You are in recovery mode means no plugin have been loaded.').'</p>'.
-               '</div>';
-          }
           
           if ($core->error->flag()) {

inc/core/class.dc.modules.php

@@ -66 +66 @@
           $this->ns = $ns;
           
-          $disabled = isset($_SESSION['sess_safe_mode']) && $_SESSION['sess_safe_mode'];
-          $disabled = $disabled && !get_parent_class($this) ? true : false;
-          
           foreach ($this->path as $root)
           {
@@ -90 +87 @@
                     && file_exists($full_entry.'/_define.php'))
                     {
-                         if (!file_exists($full_entry.'/_disabled') && !$disabled)
+                         if (!file_exists($full_entry.'/_disabled'))
                          {
                               $this->id = $entry;