diff options
| author | Aleksey Lim <alsroot@member.fsf.org> | 2009-06-28 23:39:58 (GMT) |
|---|---|---|
| committer | Aleksey Lim <alsroot@member.fsf.org> | 2009-06-28 23:39:58 (GMT) |
| commit | e6662a18f3b676f5ae53878ddb5bb0c8a037b82b (patch) | |
| tree | 19ccbddd60613d57d2675dcbdefd666c45b25ce2 | |
| parent | 3ddb26fdd016d0f751fb37e5b9153341b7d16f2c (diff) | |
Fix errors in lookup popup menu for addons names while editing collections
| -rw-r--r-- | site/app/app_controller.php | 3 | ||||
| -rw-r--r-- | site/app/views/admin/userlookup.thtml | 3 | ||||
| -rw-r--r-- | site/app/views/collections/ajax/addon_lookup.thtml | 3 | ||||
| -rw-r--r-- | site/app/views/tests/search.thtml | 3 | ||||
| -rw-r--r-- | site/app/views/versions/update_info.thtml | 5 |
5 files changed, 11 insertions, 6 deletions
diff --git a/site/app/app_controller.php b/site/app/app_controller.php index 5b8bfff..0af0447 100644 --- a/site/app/app_controller.php +++ b/site/app/app_controller.php @@ -74,7 +74,8 @@ class AppController extends Controller // content matches a file on disk. If we're appending query // logs and microtime to the page, those aren't going to match. Configure::getInstance()->debug = 0; - define('NO_MICROTIME', 1); + if (!defined('NO_MICROTIME')) + define('NO_MICROTIME', 1); } } $this->setSecurityLevel($this->securityLevel); diff --git a/site/app/views/admin/userlookup.thtml b/site/app/views/admin/userlookup.thtml index ac4bc10..ef4dcd0 100644 --- a/site/app/views/admin/userlookup.thtml +++ b/site/app/views/admin/userlookup.thtml @@ -1,6 +1,7 @@ <?php header('Content-type: text/plain'); -define('NO_MICROTIME', true); +if (!defined('NO_MICROTIME')) + define('NO_MICROTIME', true); if (count($results) > 0) { foreach ($results as $result) { diff --git a/site/app/views/collections/ajax/addon_lookup.thtml b/site/app/views/collections/ajax/addon_lookup.thtml index fe4e99b..ddabc96 100644 --- a/site/app/views/collections/ajax/addon_lookup.thtml +++ b/site/app/views/collections/ajax/addon_lookup.thtml @@ -38,7 +38,8 @@ header('Content-type: text/plain'); -define('NO_MICROTIME', true); +if (!defined('NO_MICROTIME')) + define('NO_MICROTIME', true); if (!empty($addons)) { echo "[\n"; diff --git a/site/app/views/tests/search.thtml b/site/app/views/tests/search.thtml index ac4bc10..ef4dcd0 100644 --- a/site/app/views/tests/search.thtml +++ b/site/app/views/tests/search.thtml @@ -1,6 +1,7 @@ <?php header('Content-type: text/plain'); -define('NO_MICROTIME', true); +if (!defined('NO_MICROTIME')) + define('NO_MICROTIME', true); if (count($results) > 0) { foreach ($results as $result) { diff --git a/site/app/views/versions/update_info.thtml b/site/app/views/versions/update_info.thtml index 70159f8..489881d 100644 --- a/site/app/views/versions/update_info.thtml +++ b/site/app/views/versions/update_info.thtml @@ -37,7 +37,8 @@ * ***** END LICENSE BLOCK ***** */ header('Content-type: application/xhtml+xml'); -define('NO_MICROTIME', true); +if (!defined('NO_MICROTIME')) + define('NO_MICROTIME', true); ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html lang="<?=LANG?>" dir="<?=TEXTDIR?>" xmlns="http://www.w3.org/1999/xhtml"> @@ -53,4 +54,4 @@ define('NO_MICROTIME', true); echo $updateInfo; ?></p> </body> -</html>
\ No newline at end of file +</html> |