Changeset 16392

Timestamp:

05/16/08 13:48:32 (2 months ago)

Author:

rambo

Message:

forward porting r16391

Files:

• trunk/midcom/net.nehmer.blog/handler/admin.php (modified) (1 diff)
• trunk/midcom/net.nehmer.blog/handler/view.php (modified) (4 diffs)
• trunk/midcom/net.nehmer.blog/viewer.php (modified) (3 diffs)

trunk/midcom/net.nehmer.blog/handler/admin.php

@@ -226 +226 @@
-    {
-        $this->_article = new midcom_db_article($args[0]);
+        /*
+        $qb = midcom_db_article::new_query_builder();
+        if (mgd_is_guid($args[0]))
+        {
+            $qb->add_constraint('guid', '=', $args[0]);
+        }
+        elseif (is_numeric($args[0]))
+        {
+            $qb->add_constraint('id', '=', $args[0]);
+        }
+        else
+        {
+            return false;
+        }
+        $articles = $qb->execute();
+        if (!empty($articles))
+        {
+            $thius->_article = $articles[0];
+        }
+        */
-        if (!$this->_article)
-        {

trunk/midcom/net.nehmer.blog/handler/view.php

@@ -98 +98 @@
-    function _can_handle_view ($handler_id, $args, &$data)
-    {
+        $this->_request_data['viewer_instance']->_enter_language();
-        $qb = midcom_db_article::new_query_builder();
-
@@ -156 +157 @@
-        if (!$this->_article)
-        {
+            $this->_request_data['viewer_instance']->_exit_language();
-            return false;
-            // This will 404
-        }
-
+
-        return true;
-    }
@@ -176 +178 @@
-        {
-            return false;
-
-
-
+
+
+
+
+
+
+
+
+
-        if (   isset($data['original_language'])
-            && $this->_article->lang == $data['original_language'])
@@ -185 +193 @@
-            $this->_article = new midcom_db_article($this->_article->guid);
-        }
+        */
-
-        $this->_load_datamanager();

trunk/midcom/net.nehmer.blog/viewer.php

@@ -329 +329 @@
-    function _enter_language()
-    {
+        if (isset($this->_request_data['original_language']))
+        {
+            debug_push_class(__CLASS__, __FUNCTION__);
+            $GLOBALS['midcom_debugger']->print_function_stack('_enter_language called for second time', MIDCOM_LOG_ERROR);
+            debug_pop();
+            return;
+        }
-        $lang = $this->_config->get('language');
-        if ($lang)
@@ -347 +354 @@
-        {
-            mgd_set_lang($this->_request_data['original_language']);
+            unset($this->_request_data['original_language']);
+        }
+        else
+        {
+            debug_push_class(__CLASS__, __FUNCTION__);
+            $GLOBALS['midcom_debugger']->print_function_stack('_exit_language called without being in language context', MIDCOM_LOG_ERROR);
+            debug_pop();
-        }
-    }
@@ -359 +373 @@
-    function _on_can_handle($handler, $args)
-    {
-enter_language()
+request_data['viewer_instance'] =& $this
-        return true;
-    }
-
-    function _on_can_handled($handler, $args)
-    {
-        $this->_exit_language();
-    }
-