Changeset 16377

Timestamp:

05/14/08 14:49:12 (2 months ago)

Author:

rambo

Message:

forward port r16376 with a note to use the new API later

Files:

• trunk/midcom/midcom.core/midcom/baseclasses/core/dbobject.php (modified) (1 diff)
• trunk/midcom/net.nemein.calendar/event.php (modified) (3 diffs)

trunk/midcom/midcom.core/midcom/baseclasses/core/dbobject.php

@@ -1261 +1261 @@
-        }
-
+        if (   isset($object->lang)
+            && !empty($object->name))
+        {
+            /**
+             * ML Object with non-empty name
+             *
+             * Check that we're doing anything stupid like overwriting name 
+             * derived in "lang0" with one derived from localized title
+             */
+            // FIXME: use midgard_connection::get_default_lang() with 1.9/2.0
+            $fallback_language = mgd_get_default_lang();
+            if ($object->lang != $fallback_language)
+            {
+                debug_push_class(__CLASS__, __FUNCTION__);
+                debug_add("Not regenerating name for {$object->guid}, current version is not the fallback-language one", MIDCOM_LOG_INFO);
+                debug_add("\$object->lang={$object->lang} != \$fallback_language={$fallback_language}");
+                debug_pop();
+                // This is localized version of the object, do not overwrite name silently abort instead
+                return true;
+            }
+        }
+
-        $name = midcom_generate_urlname_from_string($object->$titlefield);
-        // Strip the incrementing count suffix from name for checking

trunk/midcom/net.nemein.calendar/event.php

@@ -248 +248 @@
-    }
-
+    /**
+     * Clears the name field if user is not allowed to set it explicitly
+     *
+     * But only when in the fallback language
+     */
+    function _check_clear_name()
+    {
+        // FIXME: use midgard_connection::get_default_lang() with 1.9/2.0
+        $fallback_language = mgd_get_default_lang();
+        /*
+        debug_push_class(__CLASS__, __FUNCTION__);
+        debug_add("checking lang");
+        $fallback_language = mgd_get_default_lang();
+        debug_add("if (\$this->lang={$this->lang} != \$fallback_language={$fallback_language})");
+        debug_pop();
+        */
+        if ($this->lang != $fallback_language)
+        {
+            return;
+        }
+        if (!$this->_config->get('allow_name_change'))
+        {
+            $this->name = '';
+        }
+    }
+
-    function _on_creating()
-    {
-
-
-
-
-
+
-        if (!$this->_check_time_range())
-        {
@@ -268 +290 @@
-    function _on_updating()
-    {
-
-
-
-
+
+
+
-        }
-
@@ -293 +314 @@
-    function _on_created()
-    {
+        // In theory we should never be able to loop here since it goes on to the update callbacks, but better to be safe
-        if (isset($GLOBALS['net_nemein_calendar_event_dba__on_created_loop_{$this->guid}']))
-        {