Changeset 1631

Timestamp:

02/09/12 23:54:53 (3 months ago)

Author:

padams

Message:

merging 1.5.2 into 1.0 branch

Location:

branches/1.0

Files:

• modules/base/templates/report.tpl (modified) (1 diff)
• modules/base/templates/resultSetHtml.php (modified) (2 diffs)
• owa_auth.php (modified) (2 diffs)
• owa_env.php (modified) (1 diff)
• wp_plugin.php (modified) (2 diffs)

branches/1.0/modules/base/templates/report.tpl

@@ -36 +36 @@
                                 
                                 <?php if ( ! $this->get( 'hideSitesFilter' ) ):?>
-                                <div class="reportSectionContainer" style="margin-bottom:20px;">
+                                <div class="reportSectionContainer reportSiteFilter" style="margin-bottom:20px;">
                                 <?php include('filter_site.tpl');?>
                                 </div>

branches/1.0/modules/base/templates/resultSetHtml.php

@@ -8 +8 @@
                         <th class="<?php if($v['result_type'] === 'dimension') { echo 'dimensionColumn';} else { echo 'metricColumn';}?>"><?php echo $v['label'];?></th>
 <?php endforeach;?>
-<?php endif;?>
                 </tr>
         </thead>
@@ -31 +30 @@
                 </tr>
 <?php endforeach;?>
-<?php endif;?>
         </tbody>
 </table>

branches/1.0/owa_auth.php

@@ -73 +73 @@
          * Auth class Singleton
          *
-         * @return object
+         * @return owa_auth
          */
         public static function get_instance($plugin = '') {
@@ -114 +114 @@
                 if (owa_coreAPI::getCurrentUser()->isAuthenticated()) {
                         $ret = true;
-                } elseif (owa_coreAPI::getRequestParam('apiKey')) {
-                        
-                        
+                } elseif (owa_coreAPI::getRequestParam('apiKey')) {                     
                         // auth user by api key
                         $ret = $this->authByApiKey(owa_coreAPI::getRequestParam('apiKey'));

branches/1.0/owa_env.php

@@ -45 +45 @@
 define('OWA_CONF_DIR', OWA_DIR.'conf/');
 define('OWA_THEMES_DIR', OWA_DIR.'themes/');
-define('OWA_VERSION', '1.5.1');
+define('OWA_VERSION', '1.5.2');
 ?>

branches/1.0/wp_plugin.php

@@ -289 +289 @@
                         $domains[] = $blog->siteurl;            
                 }
-                // load assigned sites list by domain
-        $cu->loadAssignedSitesByDomain($domains);
+                
+                // check to see if we are installing before trying to load sites
+                // other wise you run into a race condition as config file
+                // might not be created.
+                if (! defined('OWA_INSTALLING') ) {
+                        // load assigned sites list by domain
+                $cu->loadAssignedSitesByDomain($domains);
+        }
+        
                 $cu->setInitialized();
     
@@ -556 +563 @@
 
         $owa = owa_getInstance($params);
-        $owa->setSetting('base', 'cache_objects', false);
-                
+        $owa->setSetting('base', 'cache_objects', false);       
         $public_url =  get_bloginfo('wpurl').'/wp-content/plugins/owa/';