commit 2509176c6b758b9c70a47057e5097e088a62bd67
parent 709b6a4c11a2d840a2283c7f8787f2294066fd0a
Author: Jan Dankert <devnull@localhost>
Date: Sat, 20 Oct 2012 21:57:50 +0200
Berücksichtigung von $errors ausbauen.
Diffstat:
1 file changed, 2 insertions(+), 20 deletions(-)
diff --git a/action/Action.class.php b/action/Action.class.php
@@ -456,21 +456,10 @@ class Action
global $image_dir;
global $view;
- // ?bertragen der Array-Variablen in den aktuellen Kontext
+ // Übertragen der Ausgabe-Variablen in den aktuellen Kontext
//
extract( $this->templateVars['output'] );
- // Falls Eingabefehler, dann Uebertragen der Request-Variablen in den aktuellen Kontext
- if ( count($errors)>0 )
- {
- foreach( $REQ as $requestVar=>$dummy )
- //if ( true|| !isset($$requestVar) )
- // Aber achtung, hier geben wir die Request-Variablen einfach so wieder raus!
- $$requestVar = $this->getRequestVar( $requestVar );
- $this->templateVars['mode'] = 'edit';
- $mode = 'edit';
- }
-
// Setzen einiger Standard-Variablen
//
$tpl_dir = OR_THEMES_DIR.$conf['interface']['theme'].'/pages/html/';
@@ -478,13 +467,6 @@ class Action
$user = Session::getUser();
- $root_stylesheet = OR_THEMES_EXT_DIR.$conf['interface']['theme'].'/css/base.css';
-
- if ( !is_object($user) )
- $user_stylesheet = OR_THEMES_EXT_DIR.$conf['interface']['theme'].'/css/'.$conf['interface']['style']['default'].'.css';
- else
- $user_stylesheet = OR_THEMES_EXT_DIR.$conf['interface']['theme'].'/css/'.$user->style.'.css';
-
$self = $HTTP_SERVER_VARS['PHP_SELF'];
if ( !empty($conf['interface']['override_title']) )
@@ -492,7 +474,7 @@ class Action
else
$cms_title = OR_TITLE.' '.OR_VERSION;
- //$charset = $this->getCharset();
+ // Wir arbeiten im HTML nur noch mit UTF-8.
$charset = 'UTF-8';
$showDuration = $conf['interface']['show_duration'];