Merge branch 'v3/3.1'

breath-co2 · Aug 5, 2013 · 51eb16c · 51eb16c
2 parents 969a5c1 + 9daa5b0
commit 51eb16c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/bin/view-error500-log b/bin/view-error500-log
@@ -143,7 +143,7 @@ else
 
     if (is_file($file))
     {
-        $data = @unserialize(gzuncompress(base64_decode(file_get_contents($file))));
+        $data = @unserialize(file_get_contents($file));
         if ($data)
         {
             $obj = $data['trace'];

diff --git a/core/classes/core.class.php b/core/classes/core.class.php
@@ -1319,7 +1319,7 @@ public static function show_500($msg = null)
                 (
                     'project'     => Core::$project,
                     'uri'         => HttpIO::$uri,
-                    'url'         => HttpIO::PROTOCOL . '://'.$_SERVER['HTTP_HOST'] . $_SERVER["REQUEST_URI"],
+                    'url'         => HttpIO::PROTOCOL . $_SERVER['HTTP_HOST'] . $_SERVER["REQUEST_URI"],
                     'post'        => HttpIO::POST(null, HttpIO::PARAM_TYPE_OLDDATA),
                     'get'         => $_SERVER['QUERY_STRING'],
                     'cookie'      => HttpIO::COOKIE(null, HttpIO::PARAM_TYPE_OLDDATA),
@@ -1340,7 +1340,7 @@ public static function show_500($msg = null)
                 $trace_array['use_time']    = microtime(1) - START_TIME;
                 $trace_array['trace']       = $trace_obj;
 
-                $trace_data = base64_encode(gzcompress(serialize($trace_array), 9));
+                $trace_data = serialize($trace_array);
                 unset($trace_array);
 
                 $view->error_saved = true;
@@ -1372,7 +1372,7 @@ public static function show_500($msg = null)
                     switch ($save_type)
                     {
                         case 'database':
-                            $obj = new Database($error_config['type_config']?$error_config['type_config']:'default');
+                            $obj = $error_config['type_config']?new Database($error_config['type_config']) : new Database();
                             $data = array
                             (
                                 'time'        => strtotime($date.' 00:00:00'),
@@ -1383,7 +1383,7 @@ public static function show_500($msg = null)
                             $obj->insert('error500_log', $data);
                             break;
                         case 'cache':
-                            $obj = new Cache($error_config['type_config']?$error_config['type_config']:'default');
+                            $obj = $error_config['type_config']?new Cache($error_config['type_config']) : new Cache();
                             if (!$obj->get($error_no))
                             {
                                 $obj->set($error_no, $trace_data, 7*86400);
@@ -1408,9 +1408,9 @@ public static function show_500($msg = null)
             $view->error = $error;
             $view->render(true);
         }
-        catch ( Exception $e )
+        catch (Exception $e)
         {
-            list ( $REQUEST_URI ) = explode('?', $_SERVER['REQUEST_URI'], 2);
+            list ($REQUEST_URI) = explode('?', $_SERVER['REQUEST_URI'], 2);
             $REQUEST_URI = htmlspecialchars(rawurldecode($REQUEST_URI));
             echo '<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">' .
             CRLF . '<html>' .