Changeset 5365

Timestamp:

12/06/07 14:01:25 (1 year ago)

Author:

p_lindheimer

Message:

voicemail needs to check for conflict extension also since it gets called before users, and make dictate and language come after so they can see the abort flag

Files:

• modules/branches/2.4/core/functions.inc.php (modified) (2 diffs)
• modules/branches/2.4/dictate/functions.inc.php (modified) (1 diff)
• modules/branches/2.4/languages/functions.inc.php (modified) (1 diff)
• modules/branches/2.4/voicemail/functions.inc.php (modified) (1 diff)

modules/branches/2.4/core/functions.inc.php

@@ -3305 +3305 @@
-        
-                if ( is_string($extdisplay) ) { 
-
-
+
+
+
+
+
-                        if (isset($deviceInfo) && is_array($deviceInfo))
-                                extract($deviceInfo);
@@ -3443 +3446 @@
-                                } else {
-                                        // really bad hack - but if core_users_add fails, want to stop core_devices_add
+                                        // Comment, this does not help everywhere. Other hooks functions can hook before
+                                        // this like voicemail!
+                                        //
-                                        $GLOBALS['abort'] = true;
-                                }

modules/branches/2.4/dictate/functions.inc.php

@@ -84 +84 @@
-        if ($tech_hardware != null || $pagename == 'users') {
-                dictation_applyhooks();
-5
+8
-        } elseif ($action=="add") {
-                // We don't need to display anything on an 'add', but we do need to handle returned data.
-5
+8
-        } elseif ($extdisplay != '') {
-                // We're now viewing an extension, so we need to display _and_ process.
-                dictation_applyhooks();
-5
+8
-        }
-}

modules/branches/2.4/languages/functions.inc.php

@@ -118 +118 @@
-        if ($tech_hardware != null || $pagename == 'users') {
-                language_applyhooks();
-5
+8
-        } elseif ($action=="add") {
-                // We don't need to display anything on an 'add', but we do need to handle returned data.
-5
+8
-        } elseif ($extdisplay != '') {
-                // We're now viewing an extension, so we need to display _and_ process.
-                language_applyhooks();
-5
+8
-        }
-}

modules/branches/2.4/voicemail/functions.inc.php

@@ -236 +236 @@
-                case "add":
-                        if (!isset($GLOBALS['abort']) || $GLOBALS['abort'] !== true) {
-
-
+
+
+
+
+
+
+
-                        }
-                break;